diff --git a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java
index ed8f290837b26..c5a3ea4307ff0 100644
--- a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java
+++ b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java
@@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.v3_3.codegen;
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.QueryExecutionEvent;
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.QueryExecutionEvent;
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id;
public interface QueryExecutionTracer
diff --git a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java
index 36a414b479a03..35cb21bc87427 100644
--- a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java
+++ b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java
@@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.QueryExecutionEvent;
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.QueryExecutionEvent;
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id;
import org.neo4j.cypher.internal.compiler.v3_3.spi.KernelStatisticProvider;
import org.neo4j.cypher.internal.v3_3.codegen.QueryExecutionTracer;
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala
index 683fe2ce892e4..e97ca2bda2635 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala
@@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.EnterpriseRuntimeContextCreator
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.EnterpriseRuntimeContextCreator
import org.neo4j.cypher.internal.compatibility.v3_3.{Compatibility, CostCompatibility}
import org.neo4j.cypher.internal.compatibility.{v2_3, v3_1, v3_2}
import org.neo4j.cypher.internal.compiler.v3_3._
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala
index 978902e9628c2..80593b8e1798c 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala
@@ -19,8 +19,8 @@
*/
package org.neo4j.cypher.internal
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.{BuildCompiledExecutionPlan, EnterpriseRuntimeContext}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.{BuildCompiledExecutionPlan, EnterpriseRuntimeContext}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
import org.neo4j.cypher.internal.compiler.v3_3.phases.LogicalPlanState
import org.neo4j.cypher.internal.frontend.v3_3.InvalidArgumentException
@@ -28,29 +28,30 @@ import org.neo4j.cypher.internal.frontend.v3_3.notification.RuntimeUnsupportedNo
import org.neo4j.cypher.internal.frontend.v3_3.phases.{Do, If, Transformer}
object EnterpriseRuntimeBuilder extends RuntimeBuilder[Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState]] {
- def create(runtimeName: Option[RuntimeName], useErrorsOverWarnings: Boolean): Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState] = runtimeName match {
- case None =>
- BuildCompiledExecutionPlan andThen
- If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty) {
- BuildInterpretedExecutionPlan
- }
+ def create(runtimeName: Option[RuntimeName], useErrorsOverWarnings: Boolean): Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState] =
+ runtimeName match {
+ case None =>
+ BuildCompiledExecutionPlan andThen
+ If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty) {
+ BuildInterpretedExecutionPlan
+ }
- case Some(InterpretedRuntimeName) =>
- BuildInterpretedExecutionPlan
+ case Some(InterpretedRuntimeName) =>
+ BuildInterpretedExecutionPlan
- case Some(CompiledRuntimeName) if useErrorsOverWarnings =>
- BuildCompiledExecutionPlan andThen
- If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
- Do((_,_) => throw new InvalidArgumentException("The given query is not currently supported in the selected runtime"))
- )
+ case Some(CompiledRuntimeName) if useErrorsOverWarnings =>
+ BuildCompiledExecutionPlan andThen
+ If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
+ Do((_, _) => throw new InvalidArgumentException("The given query is not currently supported in the selected runtime"))
+ )
- case Some(CompiledRuntimeName) =>
- BuildCompiledExecutionPlan andThen
- If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
- Do((_: EnterpriseRuntimeContext).notificationLogger.log(RuntimeUnsupportedNotification)) andThen
- BuildInterpretedExecutionPlan
- )
+ case Some(CompiledRuntimeName) =>
+ BuildCompiledExecutionPlan andThen
+ If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
+ Do((_: EnterpriseRuntimeContext).notificationLogger.log(RuntimeUnsupportedNotification)) andThen
+ BuildInterpretedExecutionPlan
+ )
- case Some(x) => throw new InvalidArgumentException(s"This version of Neo4j does not support requested runtime: $x")
- }
+ case Some(x) => throw new InvalidArgumentException(s"This version of Neo4j does not support requested runtime: $x")
+ }
}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/BuildCompiledExecutionPlan.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/BuildCompiledExecutionPlan.scala
similarity index 95%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/BuildCompiledExecutionPlan.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/BuildCompiledExecutionPlan.scala
index 2324ad0247324..df1d7d70add29 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/BuildCompiledExecutionPlan.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/BuildCompiledExecutionPlan.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan._
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{TaskCloser, _}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledExecutionResult.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala
similarity index 97%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledExecutionResult.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala
index c1d7a23a634a3..986ef46b17368 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledExecutionResult.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
import java.util
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledRuntimeBuilder.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledRuntimeBuilder.scala
similarity index 97%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledRuntimeBuilder.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledRuntimeBuilder.scala
index 369434e1b5fda..2ab0eefcb7582 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/CompiledRuntimeBuilder.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledRuntimeBuilder.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{CompiledRuntimeName, _}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/EnterpriseRuntimeContext.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/EnterpriseRuntimeContext.scala
similarity index 95%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/EnterpriseRuntimeContext.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/EnterpriseRuntimeContext.scala
index f70ffc5fcb5be..514d757a031ce 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/EnterpriseRuntimeContext.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/EnterpriseRuntimeContext.scala
@@ -17,12 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
import java.time.Clock
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.CodeStructure
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.CommunityRuntimeContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.CodeStructure
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{ExpressionEvaluator, Metrics, MetricsFactory, QueryGraphSolver}
import org.neo4j.cypher.internal.compiler.v3_3.spi.PlanContext
import org.neo4j.cypher.internal.compiler.v3_3.{ContextCreator, CypherCompilerConfiguration, SyntaxExceptionCreator, UpdateStrategy}
@@ -71,4 +71,4 @@ case class EnterpriseRuntimeContextCreator(codeStructure: CodeStructure[Generate
new EnterpriseRuntimeContext(exceptionCreator, tracer, notificationLogger, planContext,
monitors, metrics, config, queryGraphSolver, updateStrategy, debugOptions, clock, codeStructure)
}
-}
\ No newline at end of file
+}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/ExecutionPlanBuilder.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/ExecutionPlanBuilder.scala
similarity index 95%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/ExecutionPlanBuilder.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/ExecutionPlanBuilder.scala
index cedb64f6ef607..7e2e136256af4 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/ExecutionPlanBuilder.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/ExecutionPlanBuilder.scala
@@ -17,9 +17,9 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{InternalExecutionResult, PeriodicCommitInfo, PlanFingerprint, Provider}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, ProfileMode, TaskCloser}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenConfiguration.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenConfiguration.scala
similarity index 97%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenConfiguration.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenConfiguration.scala
index 1f8ff2792f14b..cdb3076045e39 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenConfiguration.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenConfiguration.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
import java.nio.file.{Path, Paths}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenContext.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenContext.scala
similarity index 93%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenContext.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenContext.scala
index 6bef15fb22bc8..c89251edf7e08 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenContext.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenContext.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.JoinData
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.JoinData
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenType
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.LogicalPlan
import org.neo4j.cypher.internal.frontend.v3_3.SemanticTable
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenPlan.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenPlan.scala
similarity index 84%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenPlan.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenPlan.scala
index dc5fdc15862a0..f697dc7ea340c 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenPlan.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenPlan.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.JoinTableType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.JoinTableType
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.LogicalPlan
trait CodeGenPlan {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenerator.scala
similarity index 91%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenerator.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenerator.scala
index 3092955918dc7..f3a682ef15990 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/CodeGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/CodeGenerator.scala
@@ -17,15 +17,15 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
import java.time.Clock
import java.util
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{CodeStructure, CodeStructureResult}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.{CompiledExecutionResult, CompiledPlan, RunnablePlan}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{CodeStructure, CodeStructureResult}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.{CompiledExecutionResult, CompiledPlan, RunnablePlan}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{InternalExecutionResult, PlanFingerprint, Provider}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, TaskCloser}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.{Id, InternalPlanDescription}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/LogicalPlanConverter.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/LogicalPlanConverter.scala
similarity index 98%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/LogicalPlanConverter.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/LogicalPlanConverter.scala
index d41c40c5124af..42b6e8a0f2604 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/LogicalPlanConverter.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/LogicalPlanConverter.scala
@@ -17,12 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.AggregationConverter.aggregateExpressionConverter
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.SortItem
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.AggregationConverter.aggregateExpressionConverter
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.SortItem
import org.neo4j.cypher.internal.compiler.v3_3.helpers.{One, ZeroOneOrMany}
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans._
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{SortDescription, plans}
@@ -33,7 +33,7 @@ import org.neo4j.cypher.internal.frontend.v3_3.{InternalException, ast, symbols}
import org.neo4j.cypher.internal.frontend.v3_3.Foldable._
import org.neo4j.cypher.internal.ir.v3_3.IdName
import ExpressionConverter.createExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.Distinct
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.Distinct
object LogicalPlanConverter {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/Namer.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/Namer.scala
similarity index 95%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/Namer.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/Namer.scala
index 34418ecb162c2..962646b1e8895 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/Namer.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/Namer.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
import java.util.concurrent.atomic.AtomicInteger
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/QueryExecutionEvent.java b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/QueryExecutionEvent.java
similarity index 93%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/QueryExecutionEvent.java
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/QueryExecutionEvent.java
index e1a2c6fe03ebb..0eb353e021ad1 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/QueryExecutionEvent.java
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/QueryExecutionEvent.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen;
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen;
public interface QueryExecutionEvent extends AutoCloseable
{
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AcceptVisitor.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AcceptVisitor.scala
similarity index 80%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AcceptVisitor.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AcceptVisitor.scala
index 1b21c0bb8c359..cebab858082d2 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AcceptVisitor.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AcceptVisitor.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class AcceptVisitor(produceResultOpName: String, columns: Map[String, CodeGenExpression])
extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AggregationInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AggregationInstruction.scala
similarity index 78%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AggregationInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AggregationInstruction.scala
index ef802cf7f9984..b31c87f438ee2 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/AggregationInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/AggregationInstruction.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.AggregateExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.AggregateExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class AggregationInstruction(opName: String, aggregationFunctions: Iterable[AggregateExpression])
extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildProbeTable.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildProbeTable.scala
similarity index 93%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildProbeTable.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildProbeTable.scala
index c7044bb7524e3..e9eeb663020e9 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildProbeTable.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildProbeTable.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
sealed trait BuildProbeTable extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildSortTable.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildSortTable.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildSortTable.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildSortTable.scala
index b75d640e7b84c..3121b6c17cb4d 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/BuildSortTable.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/BuildSortTable.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
case class BuildSortTable(opName: String, tableName: String, columnVariables: Map[String, Variable],
sortItems: Iterable[SortItem], estimateCardinality: Double)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CartesianProductInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CartesianProductInstruction.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CartesianProductInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CartesianProductInstruction.scala
index f346ef76292c6..ed3f4bf74a7a4 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CartesianProductInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CartesianProductInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class CartesianProductInstruction(id: String, instruction: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CheckingInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CheckingInstruction.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CheckingInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CheckingInstruction.scala
index 1139b44b48ca4..54e9bb2a8918b 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/CheckingInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/CheckingInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
/**
* Generates instruction for for updating a provided flag before creating the inner instruction
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/DecreaseAndReturnWhenZero.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/DecreaseAndReturnWhenZero.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/DecreaseAndReturnWhenZero.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/DecreaseAndReturnWhenZero.scala
index e14e0730af14b..0689bfc2ed48e 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/DecreaseAndReturnWhenZero.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/DecreaseAndReturnWhenZero.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{LessThanEqual, MethodStructure}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{LessThanEqual, MethodStructure}
case class DecreaseAndReturnWhenZero(opName: String, variableName: String, action: Instruction, startValue: CodeGenExpression)
extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandAllLoopDataGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandAllLoopDataGenerator.scala
similarity index 89%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandAllLoopDataGenerator.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandAllLoopDataGenerator.scala
index c64ab8967e9b2..259d376691824 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandAllLoopDataGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandAllLoopDataGenerator.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.SemanticDirection
case class ExpandAllLoopDataGenerator(opName: String, fromVar: Variable, dir: SemanticDirection,
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandIntoLoopDataGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandIntoLoopDataGenerator.scala
similarity index 88%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandIntoLoopDataGenerator.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandIntoLoopDataGenerator.scala
index d33585c3cf473..248063fd1d976 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ExpandIntoLoopDataGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ExpandIntoLoopDataGenerator.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.SemanticDirection
case class ExpandIntoLoopDataGenerator(opName: String, fromVar: Variable, dir: SemanticDirection,
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ForEachExpression.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ForEachExpression.scala
similarity index 77%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ForEachExpression.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ForEachExpression.scala
index 952016b58771c..9217d55e59a86 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ForEachExpression.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ForEachExpression.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class ForEachExpression(varName: Variable, expression: CodeGenExpression, body: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetMatchesFromProbeTable.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetMatchesFromProbeTable.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetMatchesFromProbeTable.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetMatchesFromProbeTable.scala
index 92b01c309c934..6cbb3e9edef4e 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetMatchesFromProbeTable.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetMatchesFromProbeTable.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class GetMatchesFromProbeTable(keys: Set[Variable], code: JoinData, action: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetSortedResult.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetSortedResult.scala
similarity index 87%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetSortedResult.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetSortedResult.scala
index 2283cfb11c46e..4bad4b5a8d5d4 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/GetSortedResult.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/GetSortedResult.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class GetSortedResult(opName: String,
variablesToKeep: Map[String, Variable],
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/If.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/If.scala
similarity index 78%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/If.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/If.scala
index 1ba56cddd8719..2cb64ed3828c6 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/If.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/If.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class If(predicate: CodeGenExpression, block: Instruction) extends Instruction {
override protected def children: Seq[Instruction] = Seq(block)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/IndexSeek.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/IndexSeek.scala
similarity index 84%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/IndexSeek.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/IndexSeek.scala
index e756e80e48ada..5b8382969bed8 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/IndexSeek.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/IndexSeek.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class IndexSeek(opName: String, labelName: String, propNames: Seq[String], descriptorVar: String,
expression: CodeGenExpression) extends LoopDataGenerator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Instruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Instruction.scala
similarity index 86%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Instruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Instruction.scala
index cc68fd78c9034..466a7b16482fc 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Instruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Instruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
trait Instruction {
def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext): Unit = children.foreach(_.init(generator))
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/LoopDataGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/LoopDataGenerator.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/LoopDataGenerator.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/LoopDataGenerator.scala
index d1a8dfe74b5e6..0ab8fdabebfa6 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/LoopDataGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/LoopDataGenerator.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
// Generates the code that moves data into local variables from the iterator being consumed
trait LoopDataGenerator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/MethodInvocation.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/MethodInvocation.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/MethodInvocation.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/MethodInvocation.scala
index 934375a1ed4d7..1aaee6f0042b4 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/MethodInvocation.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/MethodInvocation.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class MethodInvocation(override val operatorId: Set[String],
symbol:JoinTableMethod,
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NodeCountFromCountStoreInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NodeCountFromCountStoreInstruction.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NodeCountFromCountStoreInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NodeCountFromCountStoreInstruction.scala
index 380b0afa41cca..8cfdeb6c3d36d 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NodeCountFromCountStoreInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NodeCountFromCountStoreInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class NodeCountFromCountStoreInstruction(opName: String, variable: Variable, labels: List[Option[(Option[Int], String)]],
inner: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NullingInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NullingInstruction.scala
similarity index 86%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NullingInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NullingInstruction.scala
index 33b09e2873218..2eb01eff43051 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/NullingInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/NullingInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
/**
* Generates code that runs and afterwards checks if the provided variable has been set,
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Projection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Projection.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Projection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Projection.scala
index fb57b5c2860af..7558ba4db57fb 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/Projection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/Projection.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenExpression, CodeGenType}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenExpression, CodeGenType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class Projection(projectionOpName: String, variables: Map[Variable, CodeGenExpression], action: Instruction)
extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/RelationshipCountFromCountStoreInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/RelationshipCountFromCountStoreInstruction.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/RelationshipCountFromCountStoreInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/RelationshipCountFromCountStoreInstruction.scala
index 18882bb042462..da6cf3e2a06b2 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/RelationshipCountFromCountStoreInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/RelationshipCountFromCountStoreInstruction.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenType
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class RelationshipCountFromCountStoreInstruction(opName: String, variable: Variable, startLabel: Option[(Option[Int],String)],
relTypes: Seq[(Option[Int], String)], endLabel: Option[(Option[Int],String)],
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanAllNodes.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanAllNodes.scala
similarity index 84%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanAllNodes.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanAllNodes.scala
index 34c19fba5f8f7..a37cd09335ce6 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanAllNodes.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanAllNodes.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class ScanAllNodes(opName: String) extends LoopDataGenerator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanForLabel.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanForLabel.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanForLabel.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanForLabel.scala
index d2de96c864695..0234b232f6dae 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/ScanForLabel.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/ScanForLabel.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class ScanForLabel(opName: String, labelName: String, labelVar: String) extends LoopDataGenerator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SeekNodeById.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SeekNodeById.scala
similarity index 79%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SeekNodeById.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SeekNodeById.scala
index 45b96f7460fe1..6c2de57041f5d 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SeekNodeById.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SeekNodeById.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class SeekNodeById(opName: String, nodeVar: Variable, expression: CodeGenExpression, action: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SelectionInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SelectionInstruction.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SelectionInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SelectionInstruction.scala
index 2177c20e5df78..7790fec11457e 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SelectionInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SelectionInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class SelectionInstruction(id: String, instruction: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SkipInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SkipInstruction.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SkipInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SkipInstruction.scala
index ad7ccdf635b1b..84aca487680be 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SkipInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SkipInstruction.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{LessThan, MethodStructure}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{LessThan, MethodStructure}
case class SkipInstruction(opName: String, variableName: String, action: Instruction, numberToSkip: CodeGenExpression)
extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SortInstruction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SortInstruction.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SortInstruction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SortInstruction.scala
index b0aaa5597c7e9..7f53b095de929 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/SortInstruction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/SortInstruction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class SortInstruction(opName: String,
sortTableInfo: SortTableInfo)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindCollection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindCollection.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindCollection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindCollection.scala
index 524933bef135b..992bf53c72684 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindCollection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindCollection.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenExpression, CodeGenType}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenExpression, CodeGenType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class UnwindCollection(opName: String, collection: CodeGenExpression) extends LoopDataGenerator {
override def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext): Unit =
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindPrimitiveCollection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindPrimitiveCollection.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindPrimitiveCollection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindPrimitiveCollection.scala
index ad1c5d6676eb4..ee0f51991bd57 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/UnwindPrimitiveCollection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/UnwindPrimitiveCollection.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenExpression, CodeGenType, CypherCodeGenType, ListReferenceType}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenExpression, CodeGenType, CypherCodeGenType, ListReferenceType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols
case class UnwindPrimitiveCollection(opName: String, collection: CodeGenExpression) extends LoopDataGenerator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/WhileLoop.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/WhileLoop.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/WhileLoop.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/WhileLoop.scala
index 515a6924e26f3..d9cf4a1902ee9 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/WhileLoop.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/WhileLoop.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class WhileLoop(variable: Variable, producer: LoopDataGenerator, action: Instruction) extends Instruction {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregateExpression.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregateExpression.scala
similarity index 87%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregateExpression.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregateExpression.scala
index 9008f610b2cb3..03328bf1e8ff2 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregateExpression.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregateExpression.scala
@@ -17,12 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
trait AggregateExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregationConverter.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregationConverter.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregationConverter.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregationConverter.scala
index ac03ba0eab9f5..884fd64f894f8 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/AggregationConverter.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/AggregationConverter.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenType
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.ExpressionConverter._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.ExpressionConverter._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.compiler.v3_3.planner.CantCompileQueryException
import org.neo4j.cypher.internal.frontend.v3_3.ast
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/Distinct.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/Distinct.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/Distinct.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/Distinct.scala
index b424672aba7bc..0c69fb7d29c80 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/Distinct.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/Distinct.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{HashableTupleDescriptor, MethodStructure}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{HashableTupleDescriptor, MethodStructure}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class Distinct(opName: String, setName: String, vars: Iterable[Variable]) extends AggregateExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/DynamicCount.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/DynamicCount.scala
similarity index 86%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/DynamicCount.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/DynamicCount.scala
index 989de457eab25..e60f80c78fde4 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/DynamicCount.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/DynamicCount.scala
@@ -17,12 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{HashableTupleDescriptor, MethodStructure}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{HashableTupleDescriptor, MethodStructure}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
/*
* Dynamic count is used when a grouping key is defined. such as
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/SimpleCount.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/SimpleCount.scala
similarity index 84%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/SimpleCount.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/SimpleCount.scala
index ebf93583f9a14..6a9c552217a2b 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/aggregation/SimpleCount.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/aggregation/SimpleCount.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
/*
* Simple count is used when no grouping key is defined such as
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Addition.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Addition.scala
similarity index 88%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Addition.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Addition.scala
index a13cd35d0aa82..073bf95d19244 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Addition.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Addition.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
case class Addition(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression with BinaryOperator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/AnyProjection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/AnyProjection.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/AnyProjection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/AnyProjection.scala
index 44b2df4d540f6..61d17041d2f4d 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/AnyProjection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/AnyProjection.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.InternalException
case class AnyProjection(variable: Variable) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/BinaryOperator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/BinaryOperator.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/BinaryOperator.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/BinaryOperator.scala
index 862e34c6bfc28..fffe5d66c07d8 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/BinaryOperator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/BinaryOperator.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.CypherTypeException
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CastToCollection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CastToCollection.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CastToCollection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CastToCollection.scala
index 7863c9b90886b..257f7606fe3c6 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CastToCollection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CastToCollection.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
case class CastToCollection(expression: CodeGenExpression) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenExpression.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenExpression.scala
similarity index 80%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenExpression.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenExpression.scala
index c304e010ec8a3..ed4001f4c3315 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenExpression.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenExpression.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
trait CodeGenExpression {
def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext): Unit
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenType.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenType.scala
similarity index 95%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenType.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenType.scala
index 601d4b69018b0..263025b596742 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/CodeGenType.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/CodeGenType.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
import org.neo4j.cypher.internal.frontend.v3_3.symbols
import org.neo4j.cypher.internal.frontend.v3_3.symbols.CypherType
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Division.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Division.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Division.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Division.scala
index 43aa9cb323f9c..0dffed17ec46e 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Division.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Division.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class Division(lhs: CodeGenExpression, rhs: CodeGenExpression)
extends CodeGenExpression with BinaryOperator{
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Equals.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Equals.scala
similarity index 94%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Equals.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Equals.scala
index 73da3893ece52..d365cfc059802 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Equals.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Equals.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols.CTBoolean
import org.neo4j.cypher.internal.frontend.v3_3.{IncomparableValuesException, symbols}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ExpressionConverter.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ExpressionConverter.scala
similarity index 93%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ExpressionConverter.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ExpressionConverter.scala
index 021daaa98a0c2..ade9e782821da 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ExpressionConverter.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ExpressionConverter.scala
@@ -17,13 +17,13 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.functions.functionConverter
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.helpers.LiteralTypeSupport
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.functions.functionConverter
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.helpers.LiteralTypeSupport
import org.neo4j.cypher.internal.compiler.v3_3.planner.CantCompileQueryException
import org.neo4j.cypher.internal.frontend.v3_3.ast
import org.neo4j.cypher.internal.frontend.v3_3.ast.PropertyKeyName
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/HasLabel.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/HasLabel.scala
similarity index 86%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/HasLabel.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/HasLabel.scala
index be99b99c3074b..8dc5859a3b913 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/HasLabel.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/HasLabel.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
case class HasLabel(nodeVariable: Variable, labelVariable: String, labelName: String)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/IdOf.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/IdOf.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/IdOf.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/IdOf.scala
index cf7bdb6764dc2..e605c13647df6 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/IdOf.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/IdOf.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols
case class IdOf(variable: Variable) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ListLiteral.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ListLiteral.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ListLiteral.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ListLiteral.scala
index 5584eb2a12b51..18b72b6ce0aac 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ListLiteral.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ListLiteral.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.helpers.LiteralTypeSupport
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.helpers.LiteralTypeSupport
import org.neo4j.cypher.internal.frontend.v3_3.symbols
import org.neo4j.cypher.internal.frontend.v3_3.symbols.ListType
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Literal.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Literal.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Literal.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Literal.scala
index c583ecae2eac2..0cc6c750244ac 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Literal.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Literal.scala
@@ -17,11 +17,11 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.helpers.LiteralTypeSupport
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.helpers.LiteralTypeSupport
case class Literal(value: Object) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/LoadVariable.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/LoadVariable.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/LoadVariable.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/LoadVariable.scala
index 1e799bd7e1bf6..6edb51e1b7e80 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/LoadVariable.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/LoadVariable.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.InternalException
case class LoadVariable(variable: Variable) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MapProperty.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MapProperty.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MapProperty.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MapProperty.scala
index d9f4c511adea7..c0779f928514a 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MapProperty.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MapProperty.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{Variable, CodeGenContext}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{Variable, CodeGenContext}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class MapProperty(mapVariable: Variable, propertyKeyName: String) extends CodeGenExpression {
override def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext) = {}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Modulo.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Modulo.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Modulo.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Modulo.scala
index 113cb5e20a2ed..9bb2ee0537987 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Modulo.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Modulo.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
case class Modulo(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression with BinaryOperator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Multiplication.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Multiplication.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Multiplication.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Multiplication.scala
index 6239baceb3d52..03cf474bc2bf1 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Multiplication.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Multiplication.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class Multiplication(lhs: CodeGenExpression, rhs: CodeGenExpression)
extends CodeGenExpression with BinaryOperator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MyMap.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MyMap.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MyMap.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MyMap.scala
index 09358ca240e67..40354a45dfbd0 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/MyMap.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/MyMap.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
//Named MyMap to avoid conflict with collection.Map which makes everything weird
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeExpression.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeExpression.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeExpression.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeExpression.scala
index f2c50cf8accb6..21ea9b10cc371 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeExpression.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeExpression.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class NodeExpression(nodeIdVar: Variable) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProjection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProjection.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProjection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProjection.scala
index 79b8f52837df9..afa15cfbeed7c 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProjection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProjection.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProperty.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProperty.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProperty.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProperty.scala
index 02cdb717fb391..91e4f7e766b65 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/NodeProperty.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/NodeProperty.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
abstract class ElementProperty(token: Option[Int], propName: String, elementIdVar: String, propKeyVar: String)
extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Not.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Not.scala
similarity index 86%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Not.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Not.scala
index 3e82799aedb1c..d95d62093326f 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Not.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Not.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols.CTBoolean
case class Not(inner: CodeGenExpression) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Or.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Or.scala
similarity index 89%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Or.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Or.scala
index 3bd3e463e0803..60f4d6c0902ef 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Or.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Or.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
import org.neo4j.cypher.internal.frontend.v3_3.symbols.CTBoolean
case class Or(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Parameter.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Parameter.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Parameter.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Parameter.scala
index 4a2b20f70466d..9fc994818258d 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Parameter.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Parameter.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class Parameter(key: String, variableName: String, cType: CypherCodeGenType = CodeGenType.Any) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipExpression.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipExpression.scala
similarity index 83%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipExpression.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipExpression.scala
index 1795a0706d259..e7d668614857f 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipExpression.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipExpression.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
case class RelationshipExpression(relId: Variable) extends CodeGenExpression {
assert(relId.codeGenType == CodeGenType.primitiveRel)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipProjection.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipProjection.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipProjection.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipProjection.scala
index 603caf9abf427..0787886d058af 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RelationshipProjection.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RelationshipProjection.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RepresentationType.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RepresentationType.scala
similarity index 93%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RepresentationType.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RepresentationType.scala
index c9637d47be65d..3d21c3801911e 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/RepresentationType.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/RepresentationType.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
/**
* Type representation of a CodeGenExpression - these are the JVM types that will be used!
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Subtraction.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Subtraction.scala
similarity index 81%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Subtraction.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Subtraction.scala
index 5f29e86978af2..5f1a7f9adafbd 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/Subtraction.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/Subtraction.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class Subtraction(lhs: CodeGenExpression, rhs: CodeGenExpression)
extends CodeGenExpression with BinaryOperator {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ToSet.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ToSet.scala
similarity index 82%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ToSet.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ToSet.scala
index df812da770894..eb1cc46aa2279 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/ToSet.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/ToSet.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
case class ToSet(expression: CodeGenExpression) extends CodeGenExpression {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/TypeOf.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/TypeOf.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/TypeOf.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/TypeOf.scala
index 3efeb77535215..2f4e7c457b76f 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/expressions/TypeOf.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/expressions/TypeOf.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
case class TypeOf(relId: Variable)
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/CodeGenFunction1.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/CodeGenFunction1.scala
similarity index 90%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/CodeGenFunction1.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/CodeGenFunction1.scala
index fccf46e535ca9..521b9c64dfbfe 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/CodeGenFunction1.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/CodeGenFunction1.scala
@@ -17,9 +17,9 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.functions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.functions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
import org.neo4j.cypher.internal.frontend.v3_3.InternalException
sealed trait CodeGenFunction1 {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/functionConverter.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/functionConverter.scala
similarity index 84%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/functionConverter.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/functionConverter.scala
index 0f129050a6f3e..6f5d57d8679c0 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/ir/functions/functionConverter.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/ir/functions/functionConverter.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.functions
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.functions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
import org.neo4j.cypher.internal.compiler.v3_3.planner.CantCompileQueryException
import org.neo4j.cypher.internal.frontend.v3_3.ast
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/setStaticField.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/setStaticField.scala
similarity index 92%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/setStaticField.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/setStaticField.scala
index a21955bfc554c..7a8689a616d17 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/setStaticField.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/setStaticField.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
object setStaticField {
def apply(clazz: Class[_], name: String, value: AnyRef) = {
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructure.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructure.scala
similarity index 85%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructure.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructure.scala
index 62b8b89a7ec33..83bd444822e12 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructure.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructure.scala
@@ -17,9 +17,9 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenConfiguration, CodeGenContext}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenConfiguration, CodeGenContext}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id
/**
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructureResult.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructureResult.scala
similarity index 94%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructureResult.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructureResult.scala
index 12a75abad365b..cd829fbb6320c 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/CodeStructureResult.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/CodeStructureResult.scala
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Argument
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription.Arguments.{ByteCode, SourceCode}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/MethodStructure.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/MethodStructure.scala
similarity index 97%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/MethodStructure.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/MethodStructure.scala
index d8fc19ae8eaf0..c528f3fa9759f 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/codegen/spi/MethodStructure.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/codegen/spi/MethodStructure.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.Variable
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.Variable
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenType
import org.neo4j.cypher.internal.frontend.v3_3.SemanticDirection
/**
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/helpers/LiteralTypeSupport.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/helpers/LiteralTypeSupport.scala
similarity index 88%
rename from enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/helpers/LiteralTypeSupport.scala
rename to enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/helpers/LiteralTypeSupport.scala
index 586b4a470bec6..1997fd8b539ff 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/compiled_runtime/helpers/LiteralTypeSupport.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/helpers/LiteralTypeSupport.scala
@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.helpers
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.helpers
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{BoolType, CypherCodeGenType, ListReferenceType, LongType, ReferenceType, RepresentationType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{BoolType, CypherCodeGenType, ListReferenceType, LongType, ReferenceType, RepresentationType}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.helpers.IsMap
import org.neo4j.cypher.internal.compiler.v3_3.helpers.IsList
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/AuxGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/AuxGenerator.scala
index f4d3a4af7ad6b..2538339dbe2b1 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/AuxGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/AuxGenerator.scala
@@ -23,9 +23,9 @@ import org.neo4j.codegen.FieldReference.field
import org.neo4j.codegen.Parameter.param
import org.neo4j.codegen._
import org.neo4j.cypher.internal.codegen.CompiledEquivalenceUtils
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenType, CypherCodeGenType, ReferenceType, RepresentationType}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenType, CypherCodeGenType, ReferenceType, RepresentationType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
import org.neo4j.cypher.internal.compiler.v3_3.common.CypherOrderability
import org.neo4j.cypher.internal.frontend.v3_3.helpers._
import org.neo4j.cypher.internal.frontend.v3_3.symbols
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedMethodStructure.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedMethodStructure.scala
index f40714b9b5822..c88f99fa58968 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedMethodStructure.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedMethodStructure.scala
@@ -30,9 +30,9 @@ import org.neo4j.collection.primitive._
import org.neo4j.collection.primitive.hopscotch.LongKeyIntValueTable
import org.neo4j.cypher.internal.codegen.CompiledConversionUtils.CompositeKey
import org.neo4j.cypher.internal.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{BoolType, CodeGenType, CypherCodeGenType, FloatType, ListReferenceType, LongType, ReferenceType, RepresentationType, Parameter => _}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, QueryExecutionEvent}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{BoolType, CodeGenType, CypherCodeGenType, FloatType, ListReferenceType, LongType, ReferenceType, RepresentationType, Parameter => _}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, QueryExecutionEvent}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.commands.convert.DirectionConverter.toGraphDb
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id
import org.neo4j.cypher.internal.compiler.v3_3.spi.{NodeIdWrapper, RelationshipIdWrapper}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala
index 48ffd6643a9d8..0def34b583af8 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala
@@ -31,9 +31,9 @@ import org.neo4j.codegen.source.SourceCode.SOURCECODE
import org.neo4j.codegen.source.{SourceCode, SourceVisitor}
import org.neo4j.codegen.{CodeGenerator, Parameter, _}
import org.neo4j.cypher.internal.codegen.{PrimitiveNodeStream, PrimitiveRelationshipStream}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{CodeStructure, CodeStructureResult, MethodStructure}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{CodeStructure, CodeStructureResult, MethodStructure}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{Completable, Provider}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, TaskCloser}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.{Id, InternalPlanDescription}
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala
index ade5658a8e86e..fee1bb2f3421c 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala
@@ -24,7 +24,7 @@ import java.util
import org.neo4j.collection.primitive.{PrimitiveLongIntMap, PrimitiveLongIterator}
import org.neo4j.cypher.internal.codegen.CompiledConversionUtils.CompositeKey
import org.neo4j.cypher.internal.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.QueryExecutionEvent
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.QueryExecutionEvent
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id
import org.neo4j.cypher.internal.compiler.v3_3.spi.{InternalResultRow, InternalResultVisitor, NodeIdWrapper, RelationshipIdWrapper}
import org.neo4j.cypher.internal.javacompat.ResultRowImpl
diff --git a/enterprise/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/SetStaticFieldTest.java b/enterprise/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/SetStaticFieldTest.java
index 5659436162ce8..52321618a4335 100644
--- a/enterprise/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/SetStaticFieldTest.java
+++ b/enterprise/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/SetStaticFieldTest.java
@@ -21,7 +21,7 @@
import org.junit.Test;
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.setStaticField;
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.setStaticField;
import static org.junit.Assert.assertEquals;
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/spi/v3_3/GeneratedMethodStructureTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/spi/v3_3/GeneratedMethodStructureTest.scala
index 86c3d18441d48..05094d10fb0ed 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/spi/v3_3/GeneratedMethodStructureTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/spi/v3_3/GeneratedMethodStructureTest.scala
@@ -25,9 +25,9 @@ import org.neo4j.codegen.bytecode.ByteCode
import org.neo4j.codegen.source.SourceCode
import org.neo4j.codegen.{CodeGenerationStrategy, CodeGenerator, Expression, MethodDeclaration}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, TaskCloser}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenType, CypherCodeGenType, ReferenceType}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenType, CypherCodeGenType, ReferenceType}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{Completable, Provider}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.frontend.v3_3.helpers._
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/BuildCompiledExecutionPlanTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/BuildCompiledExecutionPlanTest.scala
index faf319d070241..03d662ea8aafe 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/BuildCompiledExecutionPlanTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/BuildCompiledExecutionPlanTest.scala
@@ -20,7 +20,7 @@
package org.neo4j.cypher.internal.compiled_runtime.v3_3
import org.neo4j.cypher.internal.compatibility.v3_3.WrappedMonitors
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.BuildCompiledExecutionPlan
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.BuildCompiledExecutionPlan
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.NewRuntimeSuccessRateMonitor
import org.neo4j.cypher.internal.compiler.v3_3.phases.LogicalPlanState
import org.neo4j.cypher.internal.compiler.v3_3.planner.CantCompileQueryException
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CodeGeneratorTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CodeGeneratorTest.scala
index 7115260f9fdb6..1476e99fdd06f 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CodeGeneratorTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CodeGeneratorTest.scala
@@ -25,8 +25,8 @@ import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
import org.neo4j.collection.primitive.PrimitiveLongIterator
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{NormalMode, TaskCloser}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.tracer
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{ByteCodeMode, CodeGenConfiguration, CodeGenerator, SourceCodeMode}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.tracer
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{ByteCodeMode, CodeGenConfiguration, CodeGenerator, SourceCodeMode}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_3.planner.LogicalPlanningTestSupport
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.{Projection => PlanProjection, _}
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala
index 578333742ff40..69c5ad99bae04 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala
@@ -23,7 +23,7 @@ import java.util
import org.mockito.Matchers._
import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.CompiledExecutionResult
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.CompiledExecutionResult
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.Completable
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, NormalMode, TaskCloser}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledRuntimeContextHelper.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledRuntimeContextHelper.scala
index 0e4ec46f4a971..360f1edc30500 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledRuntimeContextHelper.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledRuntimeContextHelper.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher.internal.compiled_runtime.v3_3.codegen
import java.time.Clock
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.EnterpriseRuntimeContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.CodeStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.EnterpriseRuntimeContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.CodeStructure
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{PlanFingerprint, PlanFingerprintReference}
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{Metrics, QueryGraphSolver}
import org.neo4j.cypher.internal.compiler.v3_3.spi.PlanContext
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/expressions/CodeGenExpressionTypesTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/expressions/CodeGenExpressionTypesTest.scala
index 9fff001aaf40d..560890f4c7641 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/expressions/CodeGenExpressionTypesTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/expressions/CodeGenExpressionTypesTest.scala
@@ -19,8 +19,8 @@
*/
package org.neo4j.cypher.internal.compiled_runtime.v3_3.codegen.expressions
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.symbols._
import org.neo4j.cypher.internal.frontend.v3_3.test_helpers.CypherFunSuite
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/BuildProbeTableInstructionsTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/BuildProbeTableInstructionsTest.scala
index 593fdfd576c5e..9349232af0c40 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/BuildProbeTableInstructionsTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/BuildProbeTableInstructionsTest.scala
@@ -25,9 +25,9 @@ import org.mockito.Mockito._
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
import org.neo4j.collection.primitive.PrimitiveLongIterator
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.{CodeGenContext, JoinTableMethod, Variable}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenType, NodeProjection}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.{CodeGenContext, JoinTableMethod, Variable}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenType, NodeProjection}
import org.neo4j.cypher.internal.frontend.v3_3.SemanticTable
import org.neo4j.cypher.internal.frontend.v3_3.test_helpers.CypherFunSuite
import org.neo4j.cypher.internal.spi.v3_3.{QueryContext, TransactionalContextWrapper}
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CodeGenSugar.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CodeGenSugar.scala
index 8db424052ce40..da51a8b7e5b36 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CodeGenSugar.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CodeGenSugar.scala
@@ -23,10 +23,10 @@ import java.util.Collections
import java.util.concurrent.atomic.AtomicInteger
import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.tracer
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.{CompiledExecutionResult, CompiledPlan}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.tracer
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.{CompiledExecutionResult, CompiledPlan}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{InternalExecutionResult, Provider}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, NormalMode, TaskCloser}
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.{Id, InternalPlanDescription}
diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CompiledProfilingTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CompiledProfilingTest.scala
index addce0b599444..fdf0c10180d6a 100644
--- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CompiledProfilingTest.scala
+++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/ir/CompiledProfilingTest.scala
@@ -22,9 +22,9 @@ package org.neo4j.cypher.internal.compiled_runtime.v3_3.codegen.ir
import org.mockito.Matchers._
import org.mockito.Mockito._
import org.neo4j.collection.primitive.PrimitiveLongIterator
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.Variable
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.{AcceptVisitor, ScanAllNodes, WhileLoop}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.{CodeGenType, NodeProjection}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.Variable
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.{AcceptVisitor, ScanAllNodes, WhileLoop}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.{CodeGenType, NodeProjection}
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ProfileMode
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.Provider
import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows}