diff --git a/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java b/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java
index 0d45511bc..296b4f433 100644
--- a/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java
+++ b/sql/src/main/java/io/cloudevents/sql/EvaluationRuntime.java
@@ -1,7 +1,7 @@
 package io.cloudevents.sql;
 
-import io.cloudevents.sql.impl.EvaluationRuntimeBuilder;
-import io.cloudevents.sql.impl.EvaluationRuntimeImpl;
+import io.cloudevents.sql.impl.runtime.EvaluationRuntimeBuilder;
+import io.cloudevents.sql.impl.runtime.EvaluationRuntimeImpl;
 
 /**
  * The evaluation runtime takes care of the function resolution, casting and other core functionalities to execute an expression.
diff --git a/sql/src/main/java/io/cloudevents/sql/Parser.java b/sql/src/main/java/io/cloudevents/sql/Parser.java
index 800f75555..6f9a42be0 100644
--- a/sql/src/main/java/io/cloudevents/sql/Parser.java
+++ b/sql/src/main/java/io/cloudevents/sql/Parser.java
@@ -1,7 +1,7 @@
 package io.cloudevents.sql;
 
-import io.cloudevents.sql.impl.ParserBuilder;
-import io.cloudevents.sql.impl.ParserImpl;
+import io.cloudevents.sql.impl.parser.ParserBuilder;
+import io.cloudevents.sql.impl.parser.ParserImpl;
 
 public interface Parser {
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternal.java b/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternal.java
similarity index 80%
rename from sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternal.java
rename to sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternal.java
index f78ffc48b..1a3c7da7a 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternal.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternal.java
@@ -1,8 +1,7 @@
-package io.cloudevents.sql.impl.expressions;
+package io.cloudevents.sql.impl;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
-import io.cloudevents.sql.impl.ExceptionThrower;
 import org.antlr.v4.runtime.misc.Interval;
 
 public interface ExpressionInternal {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternalVisitor.java b/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternalVisitor.java
similarity index 94%
rename from sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternalVisitor.java
rename to sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternalVisitor.java
index a2ef40264..b2f5eec09 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExpressionInternalVisitor.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/ExpressionInternalVisitor.java
@@ -1,4 +1,6 @@
-package io.cloudevents.sql.impl.expressions;
+package io.cloudevents.sql.impl;
+
+import io.cloudevents.sql.impl.expressions.*;
 
 public interface ExpressionInternalVisitor<T> {
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/AccessAttributeExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/AccessAttributeExpression.java
index ed496bff7..1755a8fee 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/AccessAttributeExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/AccessAttributeExpression.java
@@ -5,6 +5,7 @@
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.Base64;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java
index 94f897d67..382fdf701 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/AndExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class AndExpression extends BaseBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseBinaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseBinaryExpression.java
index 6904ed451..47b2ef199 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseBinaryExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseBinaryExpression.java
@@ -3,6 +3,8 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
 import org.antlr.v4.runtime.misc.Interval;
 
 public abstract class BaseBinaryExpression extends BaseExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseExpression.java
index 875c26f8e..1e62f1085 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseExpression.java
@@ -2,8 +2,9 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.EvaluationContextImpl;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.runtime.EvaluationContextImpl;
 import org.antlr.v4.runtime.misc.Interval;
 
 public abstract class BaseExpression implements ExpressionInternal {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java
index 64b1a3bfd..4e5cceec0 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseIntegerBinaryExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public abstract class BaseIntegerBinaryExpression extends BaseBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseUnaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseUnaryExpression.java
index 40900f653..650b8e927 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseUnaryExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/BaseUnaryExpression.java
@@ -3,6 +3,8 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
 import org.antlr.v4.runtime.misc.Interval;
 
 public abstract class BaseUnaryExpression extends BaseExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/DifferenceExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/DifferenceExpression.java
index 82baac8cf..4f0670cb6 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/DifferenceExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/DifferenceExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class DifferenceExpression extends BaseIntegerBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/DivisionExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/DivisionExpression.java
index 8f9d3069d..b28bb5803 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/DivisionExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/DivisionExpression.java
@@ -3,6 +3,7 @@
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class DivisionExpression extends BaseIntegerBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/EqualExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/EqualExpression.java
index 4335e1bba..fcfe6dbf5 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/EqualExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/EqualExpression.java
@@ -2,8 +2,9 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.EvaluationContextImpl;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.runtime.EvaluationContextImpl;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.Objects;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExistsExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExistsExpression.java
index 648dbb80b..d74cc5486 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExistsExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ExistsExpression.java
@@ -3,6 +3,7 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class ExistsExpression extends BaseExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java
index 6b6bc5525..e36e76678 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/FunctionInvocationExpression.java
@@ -5,8 +5,10 @@
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Function;
-import io.cloudevents.sql.impl.EvaluationContextImpl;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
+import io.cloudevents.sql.impl.runtime.EvaluationContextImpl;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.ArrayList;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java
index 71a9e5b7b..d41c4f800 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/InExpression.java
@@ -3,8 +3,10 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Type;
-import io.cloudevents.sql.impl.EvaluationContextImpl;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
+import io.cloudevents.sql.impl.runtime.EvaluationContextImpl;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.List;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java
index 78799853b..bc1e2c818 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/IntegerComparisonBinaryExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.function.BiFunction;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/LikeExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/LikeExpression.java
index aa13d53ee..dd6366cd3 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/LikeExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/LikeExpression.java
@@ -3,6 +3,8 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
 import org.antlr.v4.runtime.misc.Interval;
 
 import java.util.regex.Pattern;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ModuleExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ModuleExpression.java
index ff9127851..f15abe7ce 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ModuleExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ModuleExpression.java
@@ -3,6 +3,7 @@
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class ModuleExpression extends BaseIntegerBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/MultiplicationExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/MultiplicationExpression.java
index 834b5432d..1a6da19e6 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/MultiplicationExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/MultiplicationExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class MultiplicationExpression extends BaseIntegerBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/NegateExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/NegateExpression.java
index ff3558aa2..c3e359f60 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/NegateExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/NegateExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class NegateExpression extends BaseUnaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/NotExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/NotExpression.java
index 7a17814cf..7b0f5966d 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/NotExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/NotExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class NotExpression extends BaseUnaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/OrExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/OrExpression.java
index 61f0e2a0f..58b72405f 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/OrExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/OrExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class OrExpression extends BaseBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/SumExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/SumExpression.java
index c45cebcee..cafc6cb69 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/SumExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/SumExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class SumExpression extends BaseIntegerBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ValueExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ValueExpression.java
index c04e73446..f5847a5fd 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/ValueExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/ValueExpression.java
@@ -3,7 +3,8 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
-import io.cloudevents.sql.impl.LiteralUtils;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
+import io.cloudevents.sql.impl.parser.LiteralUtils;
 import org.antlr.v4.runtime.misc.Interval;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java b/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java
index 85f316cdf..67089819c 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/expressions/XorExpression.java
@@ -2,6 +2,7 @@
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.impl.ExceptionThrower;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class XorExpression extends BaseBinaryExpression {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/CaseChangingCharStream.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/CaseChangingCharStream.java
similarity index 98%
rename from sql/src/main/java/io/cloudevents/sql/impl/CaseChangingCharStream.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/CaseChangingCharStream.java
index 4f859f323..20f39c281 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/CaseChangingCharStream.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/CaseChangingCharStream.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.misc.Interval;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ConstantFoldingExpressionVisitor.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/ConstantFoldingExpressionVisitor.java
similarity index 84%
rename from sql/src/main/java/io/cloudevents/sql/impl/ConstantFoldingExpressionVisitor.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/ConstantFoldingExpressionVisitor.java
index b6f48db2c..8c4f76de3 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ConstantFoldingExpressionVisitor.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/ConstantFoldingExpressionVisitor.java
@@ -1,8 +1,14 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import io.cloudevents.SpecVersion;
 import io.cloudevents.sql.EvaluationRuntime;
-import io.cloudevents.sql.impl.expressions.*;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternalVisitor;
+import io.cloudevents.sql.impl.expressions.BaseBinaryExpression;
+import io.cloudevents.sql.impl.expressions.BaseUnaryExpression;
+import io.cloudevents.sql.impl.expressions.ExistsExpression;
+import io.cloudevents.sql.impl.expressions.ValueExpression;
+import io.cloudevents.sql.impl.runtime.FailFastExceptionThrower;
 
 public class ConstantFoldingExpressionVisitor implements ExpressionInternalVisitor<ExpressionInternal> {
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ExpressionTranslatorVisitor.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/ExpressionTranslatorVisitor.java
similarity index 98%
rename from sql/src/main/java/io/cloudevents/sql/impl/ExpressionTranslatorVisitor.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/ExpressionTranslatorVisitor.java
index 2ece6307b..fd8d9b948 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ExpressionTranslatorVisitor.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/ExpressionTranslatorVisitor.java
@@ -1,9 +1,10 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import io.cloudevents.sql.ParseException;
 import io.cloudevents.sql.Type;
 import io.cloudevents.sql.generated.CESQLParserBaseVisitor;
 import io.cloudevents.sql.generated.CESQLParserParser;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.expressions.*;
 
 import java.util.List;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/LiteralUtils.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/LiteralUtils.java
similarity index 93%
rename from sql/src/main/java/io/cloudevents/sql/impl/LiteralUtils.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/LiteralUtils.java
index 2ef1f0b86..d0c927d8e 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/LiteralUtils.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/LiteralUtils.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import org.antlr.v4.runtime.tree.TerminalNode;
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ParserBuilder.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/ParserBuilder.java
similarity index 92%
rename from sql/src/main/java/io/cloudevents/sql/impl/ParserBuilder.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/ParserBuilder.java
index 6d723542b..feaf6c585 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ParserBuilder.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/ParserBuilder.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import io.cloudevents.sql.Parser;
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ParserImpl.java b/sql/src/main/java/io/cloudevents/sql/impl/parser/ParserImpl.java
similarity index 95%
rename from sql/src/main/java/io/cloudevents/sql/impl/ParserImpl.java
rename to sql/src/main/java/io/cloudevents/sql/impl/parser/ParserImpl.java
index 9839b24b0..30f9437dc 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ParserImpl.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/parser/ParserImpl.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.Expression;
@@ -6,7 +6,8 @@
 import io.cloudevents.sql.Parser;
 import io.cloudevents.sql.generated.CESQLParserLexer;
 import io.cloudevents.sql.generated.CESQLParserParser;
-import io.cloudevents.sql.impl.expressions.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternal;
+import io.cloudevents.sql.impl.runtime.ExpressionImpl;
 import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.ATNConfigSet;
 import org.antlr.v4.runtime.dfa.DFA;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationContextImpl.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationContextImpl.java
similarity index 93%
rename from sql/src/main/java/io/cloudevents/sql/impl/EvaluationContextImpl.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationContextImpl.java
index 17e7c8018..1125079a5 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationContextImpl.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationContextImpl.java
@@ -1,7 +1,8 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationContext;
 import io.cloudevents.sql.EvaluationException;
+import io.cloudevents.sql.impl.ExceptionThrower;
 import org.antlr.v4.runtime.misc.Interval;
 
 public class EvaluationContextImpl implements EvaluationContext {
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationResult.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationResult.java
similarity index 97%
rename from sql/src/main/java/io/cloudevents/sql/impl/EvaluationResult.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationResult.java
index 082b45461..d67ac1e18 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationResult.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationResult.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.Result;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeBuilder.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeBuilder.java
similarity index 94%
rename from sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeBuilder.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeBuilder.java
index eff6e38c8..e12ed6ce1 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeBuilder.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeBuilder.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Function;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeImpl.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImpl.java
similarity index 97%
rename from sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeImpl.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImpl.java
index ebd7e3ebd..67538f732 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/EvaluationRuntimeImpl.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImpl.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.*;
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ExceptionStore.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/ExceptionStore.java
similarity index 85%
rename from sql/src/main/java/io/cloudevents/sql/impl/ExceptionStore.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/ExceptionStore.java
index baba60b64..9bb969531 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ExceptionStore.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/ExceptionStore.java
@@ -1,6 +1,7 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationException;
+import io.cloudevents.sql.impl.ExceptionThrower;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/ExpressionImpl.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/ExpressionImpl.java
similarity index 87%
rename from sql/src/main/java/io/cloudevents/sql/impl/ExpressionImpl.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/ExpressionImpl.java
index 29ab5bc39..0206617da 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/ExpressionImpl.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/ExpressionImpl.java
@@ -1,11 +1,11 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;
 import io.cloudevents.sql.Expression;
 import io.cloudevents.sql.Result;
-import io.cloudevents.sql.impl.expressions.ExpressionInternal;
+import io.cloudevents.sql.impl.ExpressionInternal;
 
 public class ExpressionImpl implements Expression {
 
@@ -27,7 +27,7 @@ public Object tryEvaluate(EvaluationRuntime evaluationRuntime, CloudEvent event)
         return this.expressionInternal.evaluate(evaluationRuntime, event, FailFastExceptionThrower.getInstance());
     }
 
-    protected ExpressionInternal getExpressionInternal() {
+    public ExpressionInternal getExpressionInternal() {
         return expressionInternal;
     }
 }
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/FailFastExceptionThrower.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/FailFastExceptionThrower.java
similarity index 80%
rename from sql/src/main/java/io/cloudevents/sql/impl/FailFastExceptionThrower.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/FailFastExceptionThrower.java
index a7b612276..fdc2e1517 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/FailFastExceptionThrower.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/FailFastExceptionThrower.java
@@ -1,16 +1,17 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationContext;
 import io.cloudevents.sql.EvaluationException;
+import io.cloudevents.sql.impl.ExceptionThrower;
 import org.antlr.v4.runtime.misc.Interval;
 
-class FailFastExceptionThrower implements ExceptionThrower, EvaluationContext {
+public class FailFastExceptionThrower implements ExceptionThrower, EvaluationContext {
 
     private static class SingletonContainer {
         private final static FailFastExceptionThrower INSTANCE = new FailFastExceptionThrower();
     }
 
-    static FailFastExceptionThrower getInstance() {
+    public static FailFastExceptionThrower getInstance() {
         return FailFastExceptionThrower.SingletonContainer.INSTANCE;
     }
 
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/FunctionTable.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/FunctionTable.java
similarity index 99%
rename from sql/src/main/java/io/cloudevents/sql/impl/FunctionTable.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/FunctionTable.java
index dc935f0f7..b74de42f7 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/FunctionTable.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/FunctionTable.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.Function;
 import io.cloudevents.sql.impl.functions.*;
diff --git a/sql/src/main/java/io/cloudevents/sql/impl/TypeCastingProvider.java b/sql/src/main/java/io/cloudevents/sql/impl/runtime/TypeCastingProvider.java
similarity index 98%
rename from sql/src/main/java/io/cloudevents/sql/impl/TypeCastingProvider.java
rename to sql/src/main/java/io/cloudevents/sql/impl/runtime/TypeCastingProvider.java
index 8bc3b7d75..51f881bcc 100644
--- a/sql/src/main/java/io/cloudevents/sql/impl/TypeCastingProvider.java
+++ b/sql/src/main/java/io/cloudevents/sql/impl/runtime/TypeCastingProvider.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationContext;
 import io.cloudevents.sql.EvaluationException;
diff --git a/sql/src/test/java/io/cloudevents/sql/CustomFunctionsTest.java b/sql/src/test/java/io/cloudevents/sql/CustomFunctionsTest.java
index 5ce3017f5..9e91b4890 100644
--- a/sql/src/test/java/io/cloudevents/sql/CustomFunctionsTest.java
+++ b/sql/src/test/java/io/cloudevents/sql/CustomFunctionsTest.java
@@ -3,9 +3,9 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.cloudevents.core.test.Data;
-import io.cloudevents.sql.impl.EvaluationRuntimeBuilder;
 import io.cloudevents.sql.impl.functions.BaseFunction;
 import io.cloudevents.sql.impl.functions.InfallibleOneArgumentFunction;
+import io.cloudevents.sql.impl.runtime.EvaluationRuntimeBuilder;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
diff --git a/sql/src/test/java/io/cloudevents/sql/impl/ConstantFoldingTest.java b/sql/src/test/java/io/cloudevents/sql/impl/parser/ConstantFoldingTest.java
similarity index 95%
rename from sql/src/test/java/io/cloudevents/sql/impl/ConstantFoldingTest.java
rename to sql/src/test/java/io/cloudevents/sql/impl/parser/ConstantFoldingTest.java
index 63e208d33..f219ce5b6 100644
--- a/sql/src/test/java/io/cloudevents/sql/impl/ConstantFoldingTest.java
+++ b/sql/src/test/java/io/cloudevents/sql/impl/parser/ConstantFoldingTest.java
@@ -1,11 +1,12 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.parser;
 
 import io.cloudevents.sql.Expression;
 import io.cloudevents.sql.Parser;
+import io.cloudevents.sql.impl.ExpressionInternal;
 import io.cloudevents.sql.impl.expressions.BaseBinaryExpression;
 import io.cloudevents.sql.impl.expressions.ExistsExpression;
-import io.cloudevents.sql.impl.expressions.ExpressionInternal;
 import io.cloudevents.sql.impl.expressions.ValueExpression;
+import io.cloudevents.sql.impl.runtime.ExpressionImpl;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sql/src/test/java/io/cloudevents/sql/impl/EvaluationRuntimeImplTest.java b/sql/src/test/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImplTest.java
similarity index 94%
rename from sql/src/test/java/io/cloudevents/sql/impl/EvaluationRuntimeImplTest.java
rename to sql/src/test/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImplTest.java
index e47a4d133..b258c87a4 100644
--- a/sql/src/test/java/io/cloudevents/sql/impl/EvaluationRuntimeImplTest.java
+++ b/sql/src/test/java/io/cloudevents/sql/impl/runtime/EvaluationRuntimeImplTest.java
@@ -1,4 +1,4 @@
-package io.cloudevents.sql.impl;
+package io.cloudevents.sql.impl.runtime;
 
 import io.cloudevents.sql.EvaluationException;
 import io.cloudevents.sql.EvaluationRuntime;