From 0f1c7439d5ba2bf4bfbd2b990bf214b5a28406bf Mon Sep 17 00:00:00 2001
From: Pontus Melke <pontusmelke@gmail.com>
Date: Mon, 14 Mar 2016 20:03:41 +0100
Subject: [PATCH] Renamed modules

---
 community/cypher/acceptance/pom.xml           |  6 +-
 .../acceptance/FunctionsAcceptanceTest.scala  |  2 +-
 .../acceptance/LabelsAcceptanceTest.scala     |  2 +-
 .../acceptance/LoadCsvAcceptanceTest.scala    |  4 +-
 .../acceptance/MatchAcceptanceTest.scala      |  2 +-
 ...ionsBackedByCountStoreAcceptanceTest.scala |  4 +-
 .../MatchLongPatternAcceptanceTest.scala      |  4 +-
 .../acceptance/MergeIntoAcceptanceTest.scala  |  2 +-
 .../acceptance/OrderByAcceptanceTest.scala    |  2 +-
 .../PatternExpressionAcceptanceTest.scala     |  6 +-
 .../PeriodicCommitAcceptanceTest.scala        |  6 +-
 .../acceptance/PreParsingAcceptanceTest.scala |  2 +-
 .../QueryPlanCompactionAcceptanceTest.scala   |  4 +-
 .../acceptance/ReturnAcceptanceTest.scala     |  4 +-
 .../ShortestPathAcceptanceTest.scala          |  2 +-
 ...athExhaustiveForbiddenAcceptanceTest.scala |  4 +-
 .../ShortestPathLongerAcceptanceTest.scala    |  8 +--
 .../acceptance/StartsWithAcceptanceTest.scala |  2 +-
 .../StatisticsPlanningAcceptanceTest.scala    |  2 +-
 .../acceptance/UsingAcceptanceTest.scala      |  8 +--
 community/cypher/compatibility-suite/pom.xml  |  2 +-
 .../cypher/cucumber/reporter/JsonResult.scala |  2 +-
 .../cucumber/reporter/OutputProducer.scala    |  2 +-
 .../.gitignore                                |  0
 .../LICENSE.txt                               |  0
 .../LICENSES.txt                              |  0
 .../NOTICE.txt                                |  0
 .../README.txt                                |  0
 .../pom.xml                                   | 10 +--
 .../v3_1}/CompilationPhaseTracer.java         |  2 +-
 .../v3_1}/codegen/QueryExecutionTracer.java   |  4 +-
 .../compiler/v3_1}/codegen/ResultRowImpl.java |  4 +-
 .../codegen/profiling/ProfilingTracer.java    |  8 +--
 .../v3_1}/executionplan/GeneratedQuery.java   | 12 ++--
 .../GeneratedQueryExecution.java              |  8 +--
 .../compiler/v3_1}/spi/InternalResultRow.java |  2 +-
 .../v3_1}/spi/InternalResultVisitor.java      |  2 +-
 .../internal/compiler/v3_1}/ASTRewriter.scala | 14 ++---
 .../compiler/v3_1}/AbstractPattern.scala      | 18 +++---
 .../compiler/v3_1}/BoundOrdering.scala        |  4 +-
 .../compiler/v3_1}/CacheAccessor.scala        |  2 +-
 .../internal/compiler/v3_1}/Comparer.scala    |  6 +-
 .../compiler/v3_1}/CypherCompiler.scala       | 38 +++++------
 .../compiler/v3_1}/CypherOrdering.scala       |  2 +-
 .../compiler/v3_1}/CypherSerializer.scala     | 10 +--
 .../compiler/v3_1}/ExecutionContext.scala     |  2 +-
 .../compiler/v3_1}/ExecutionMode.scala        |  4 +-
 .../v3_1}/ExecutionResultDumper.scala         |  4 +-
 .../v3_1}/ExplainExecutionResult.scala        | 10 +--
 .../v3_1}/HardcodedGraphStatistics.scala      |  8 +--
 .../compiler/v3_1}/HasOptionalDefault.scala   |  2 +-
 .../internal/compiler/v3_1}/IdentitySet.scala |  4 +-
 .../v3_1}/InternalNotificationLogger.scala    |  4 +-
 .../v3_1}/InternalQueryStatistics.scala       |  2 +-
 .../internal/compiler/v3_1}/LRUCache.scala    |  2 +-
 .../internal/compiler/v3_1}/LabelSpec.scala   | 10 +--
 .../internal/compiler/v3_1}/Maybe.scala       |  4 +-
 .../internal/compiler/v3_1}/Monitors.scala    |  2 +-
 .../internal/compiler/v3_1}/OnAction.scala    |  4 +-
 .../compiler/v3_1}/PipeExecutionResult.scala  | 16 ++---
 .../internal/compiler/v3_1}/PlannerName.scala |  2 +-
 .../compiler/v3_1}/PreparedQuery.scala        | 12 ++--
 .../compiler/v3_1}/ResultIterator.scala       |  6 +-
 .../compiler/v3_1}/RuntimeBuilder.scala       | 36 +++++------
 .../internal/compiler/v3_1}/RuntimeName.scala |  2 +-
 .../compiler/v3_1}/ScopeTreeVerifier.scala    |  4 +-
 .../internal/compiler/v3_1}/SeekRange.scala   |  4 +-
 .../compiler/v3_1}/SemanticChecker.scala      |  6 +-
 .../v3_1}/SyntaxExceptionCreator.scala        |  4 +-
 .../internal/compiler/v3_1}/TaskCloser.scala  |  2 +-
 .../compiler/v3_1}/UpdateStrategy.scala       |  2 +-
 .../v3_1}/ast/NestedPipeExpression.scala      | 12 ++--
 .../compiler/v3_1}/ast/QueryTagger.scala      |  6 +-
 .../compiler/v3_1}/ast/ResolvedCall.scala     | 16 ++---
 .../compiler/v3_1}/ast/SeekRangeWrapper.scala | 10 +--
 .../conditions/aggregationsAreIsolated.scala  |  8 +--
 .../ast/conditions/collectNodesOfType.scala   |  6 +-
 ...containsNamedPathOnlyForShortestPath.scala |  6 +-
 .../conditions/containsNoMatchingNodes.scala  |  8 +--
 .../conditions/containsNoNodesOfType.scala    |  6 +-
 .../ast/conditions/containsNoReturnAll.scala  |  6 +-
 .../noDuplicatesInReturnItems.scala           |  6 +-
 .../noReferenceEqualityAmongVariables.scala   |  8 +--
 .../noUnnamedPatternElementsInMatch.scala     |  6 +-
 .../normalizedEqualsArguments.scala           |  8 +--
 .../conditions/orderByOnlyOnVariables.scala   |  6 +-
 .../commands/ExpressionConverters.scala       | 30 ++++-----
 .../convert/commands/OtherConverters.scala    |  8 +--
 .../convert/commands/PatternConverters.scala  | 16 ++---
 .../commands/StatementConverters.scala        | 24 +++----
 .../plannerQuery/ClauseConverters.scala       | 20 +++---
 .../plannerQuery/ExpressionConverters.scala   | 16 ++---
 .../plannerQuery/PatternConverters.scala      | 10 +--
 .../plannerQuery/PlannerQueryBuilder.scala    | 12 ++--
 .../plannerQuery/StatementConverters.scala    | 10 +--
 .../groupInequalityPredicates.scala           | 10 +--
 .../internal/compiler/v3_1}/ast/package.scala |  2 +-
 .../v3_1}/ast/rewriters/CNFNormalizer.scala   | 16 ++---
 .../v3_1}/ast/rewriters/InliningContext.scala |  8 +--
 .../MatchPredicateNormalization.scala         |  6 +-
 .../rewriters/MatchPredicateNormalizer.scala  |  8 +--
 .../v3_1}/ast/rewriters/Namespacer.scala      | 10 +--
 .../ast/rewriters/PredicateSplitter.scala     |  6 +-
 .../rewriters/addUniquenessPredicates.scala   |  6 +-
 .../ast/rewriters/collapseInCollections.scala |  6 +-
 .../v3_1}/ast/rewriters/copyVariables.scala   |  6 +-
 .../v3_1}/ast/rewriters/expandStar.scala      |  6 +-
 .../v3_1}/ast/rewriters/foldConstants.scala   | 10 +--
 .../ast/rewriters/inlineProjections.scala     | 10 +--
 .../rewriters/inliningContextCreator.scala    |  6 +-
 .../ast/rewriters/isolateAggregation.scala    | 10 +--
 .../ast/rewriters/literalReplacement.scala    |  8 +--
 .../rewriters/nameMatchPatternElements.scala  |  6 +-
 .../ast/rewriters/namePatternElements.scala   | 10 +--
 .../rewriters/normalizeArgumentOrder.scala    |  6 +-
 .../ast/rewriters/normalizeComparisons.scala  |  6 +-
 .../rewriters/normalizeMatchPredicates.scala  |  2 +-
 .../ast/rewriters/normalizeNotEquals.scala    |  6 +-
 .../rewriters/normalizeReturnClauses.scala    |  8 +--
 .../normalizeSargablePredicates.scala         |  8 +--
 .../ast/rewriters/normalizeWithClauses.scala  |  8 +--
 .../projectFreshSortExpressions.scala         |  6 +-
 .../ast/rewriters/projectNamedPaths.scala     | 10 +--
 .../reattachAliasedExpressions.scala          |  8 +--
 ...replaceLiteralDynamicPropertyLookups.scala |  8 +--
 .../rewriteEqualityToInCollection.scala       |  6 +-
 .../v3_1}/codegen/CodeGenContext.scala        | 12 ++--
 .../compiler/v3_1}/codegen/CodeGenPlan.scala  |  6 +-
 .../v3_1}/codegen/CodeGenerator.scala         | 28 ++++-----
 .../v3_1}/codegen/CodeStructure.scala         |  8 +--
 .../v3_1}/codegen/LogicalPlanConverter.scala  | 22 +++----
 .../compiler/v3_1}/codegen/Namer.scala        |  2 +-
 .../v3_1}/codegen/QueryExecutionEvent.java    |  2 +-
 .../v3_1}/codegen/ir/AcceptVisitor.scala      |  6 +-
 .../v3_1}/codegen/ir/BuildProbeTable.scala    |  4 +-
 .../ir/CartesianProductInstruction.scala      |  4 +-
 .../codegen/ir/CheckingInstruction.scala      |  4 +-
 .../ir/DecreaseAndReturnWhenZero.scala        |  6 +-
 .../ir/ExpandAllLoopDataGenerator.scala       |  6 +-
 .../ir/ExpandIntoLoopDataGenerator.scala      |  6 +-
 .../v3_1}/codegen/ir/ForEachExpression.scala  |  8 +--
 .../codegen/ir/GetMatchesFromProbeTable.scala |  4 +-
 .../compiler/v3_1}/codegen/ir/If.scala        |  6 +-
 .../compiler/v3_1}/codegen/ir/IndexSeek.scala |  6 +-
 .../v3_1}/codegen/ir/IndexUniqueSeek.scala    |  6 +-
 .../v3_1}/codegen/ir/Instruction.scala        |  4 +-
 .../v3_1}/codegen/ir/LoopDataGenerator.scala  |  4 +-
 .../v3_1}/codegen/ir/MethodInvocation.scala   |  4 +-
 .../v3_1}/codegen/ir/NullingInstruction.scala |  4 +-
 .../v3_1}/codegen/ir/Projection.scala         |  6 +-
 .../v3_1}/codegen/ir/ScanAllNodes.scala       |  4 +-
 .../v3_1}/codegen/ir/ScanForLabel.scala       |  4 +-
 .../codegen/ir/SelectionInstruction.scala     |  4 +-
 .../compiler/v3_1}/codegen/ir/WhileLoop.scala |  4 +-
 .../codegen/ir/expressions/Addition.scala     |  6 +-
 .../ir/expressions/BinaryOperator.scala       |  6 +-
 .../ir/expressions/CastToCollection.scala     |  6 +-
 .../ir/expressions/CodeGenExpression.scala    |  6 +-
 .../codegen/ir/expressions/Collection.scala   |  6 +-
 .../codegen/ir/expressions/Division.scala     |  4 +-
 .../v3_1}/codegen/ir/expressions/Equals.scala |  6 +-
 .../ir/expressions/ExpressionConverter.scala  | 16 ++---
 .../codegen/ir/expressions/HasLabel.scala     |  6 +-
 .../codegen/ir/expressions/Literal.scala      |  6 +-
 .../codegen/ir/expressions/LoadVariable.scala |  6 +-
 .../v3_1}/codegen/ir/expressions/Modulo.scala |  6 +-
 .../ir/expressions/Multiplication.scala       |  4 +-
 .../v3_1}/codegen/ir/expressions/MyMap.scala  |  6 +-
 .../ir/expressions/NodeExpression.scala       |  8 +--
 .../ir/expressions/NodeProjection.scala       |  8 +--
 .../codegen/ir/expressions/NodeProperty.scala |  6 +-
 .../v3_1}/codegen/ir/expressions/Not.scala    |  6 +-
 .../v3_1}/codegen/ir/expressions/Or.scala     |  6 +-
 .../codegen/ir/expressions/Parameter.scala    |  6 +-
 .../expressions/RelationshipExpression.scala  |  8 +--
 .../expressions/RelationshipProjection.scala  |  8 +--
 .../codegen/ir/expressions/Subtraction.scala  |  4 +-
 .../v3_1}/codegen/ir/expressions/ToSet.scala  |  6 +-
 .../v3_1}/codegen/ir/expressions/TypeOf.scala |  6 +-
 .../ir/functions/CodeGenFunction1.scala       |  6 +-
 .../ir/functions/functionConverter.scala      | 10 +--
 .../v3_1}/codegen/setStaticField.scala        |  2 +-
 .../compiler/v3_1}/commands/AstNode.scala     | 10 +--
 .../v3_1}/commands/CreateUniqueAst.scala      |  8 +--
 .../commands/EntityProducerFactory.scala      | 18 +++---
 .../v3_1}/commands/InCollection.scala         |  8 +--
 .../v3_1}/commands/IndexOperation.scala       |  2 +-
 .../compiler/v3_1}/commands/LabelAction.scala | 18 +++---
 .../compiler/v3_1}/commands/MergeAst.scala    | 18 +++---
 .../compiler/v3_1}/commands/NamedPath.scala   |  4 +-
 .../v3_1}/commands/PathExpression.scala       | 20 +++---
 .../v3_1}/commands/PathExtractor.scala        |  4 +-
 .../compiler/v3_1}/commands/Pattern.scala     | 22 +++----
 .../compiler/v3_1}/commands/Query.scala       |  8 +--
 .../v3_1}/commands/QueryBuilder.scala         |  6 +-
 .../compiler/v3_1}/commands/QueryString.scala |  2 +-
 .../compiler/v3_1}/commands/ReturnItem.scala  |  8 +--
 .../compiler/v3_1}/commands/SortItem.scala    | 10 +--
 .../compiler/v3_1}/commands/StartItem.scala   | 18 +++---
 .../compiler/v3_1}/commands/Union.scala       |  2 +-
 .../compiler/v3_1}/commands/coerce.scala      | 14 ++---
 .../v3_1}/commands/expressions/Add.scala      | 14 ++---
 .../expressions/AggregationExpression.scala   | 12 ++--
 .../v3_1}/commands/expressions/Avg.scala      |  6 +-
 .../v3_1}/commands/expressions/Closure.scala  |  4 +-
 .../expressions/CoalesceFunction.scala        |  8 +--
 .../v3_1}/commands/expressions/CoerceTo.scala | 12 ++--
 .../v3_1}/commands/expressions/Collect.scala  |  8 +--
 .../commands/expressions/Collection.scala     |  8 +--
 .../CollectionSliceExpression.scala           | 10 +--
 .../commands/expressions/ContainerIndex.scala | 14 ++---
 .../v3_1}/commands/expressions/Count.scala    |  8 +--
 .../commands/expressions/CountStar.scala      | 10 +--
 .../expressions/DistanceFunction.scala        | 12 ++--
 .../v3_1}/commands/expressions/Distinct.scala | 10 +--
 .../v3_1}/commands/expressions/Divide.scala   |  8 +--
 .../commands/expressions/Expression.scala     | 22 +++----
 .../expressions/ExtractFunction.scala         | 12 ++--
 .../commands/expressions/FilterFunction.scala | 14 ++---
 .../commands/expressions/GenericCase.scala    | 10 +--
 .../commands/expressions/GetDegree.scala      | 18 +++---
 .../commands/expressions/IdFunction.scala     | 12 ++--
 .../InequalitySeekRangeExpression.scala       | 12 ++--
 .../commands/expressions/KeysFunction.scala   | 18 +++---
 .../commands/expressions/LabelsFunction.scala | 16 ++---
 .../commands/expressions/LengthFunction.scala | 10 +--
 .../v3_1}/commands/expressions/Literal.scala  | 10 +--
 .../commands/expressions/LiteralMap.scala     |  8 +--
 .../commands/expressions/MathFunction.scala   | 12 ++--
 .../v3_1}/commands/expressions/Max.scala      |  8 +--
 .../v3_1}/commands/expressions/Min.scala      |  8 +--
 .../v3_1}/commands/expressions/Modulo.scala   |  2 +-
 .../v3_1}/commands/expressions/Multiply.scala |  2 +-
 .../expressions/NestedPipeExpression.scala    | 10 +--
 .../commands/expressions/NodesFunction.scala  | 12 ++--
 .../v3_1}/commands/expressions/Null.scala     |  8 +--
 .../expressions/NullInNullOutExpression.scala |  4 +-
 .../expressions/ParameterExpression.scala     |  8 +--
 .../v3_1}/commands/expressions/PathImpl.scala |  2 +-
 .../expressions/PathValueBuilder.scala        |  2 +-
 .../commands/expressions/Percentile.scala     | 10 +--
 .../commands/expressions/PointFunction.scala  | 16 ++---
 .../v3_1}/commands/expressions/Pow.scala      |  2 +-
 .../PrefixSeekRangeExpression.scala           | 12 ++--
 .../commands/expressions/ProjectedPath.scala  | 10 +--
 .../expressions/PropertiesFunction.scala      | 14 ++---
 .../v3_1}/commands/expressions/Property.scala | 18 +++---
 .../commands/expressions/ReduceFunction.scala | 10 +--
 .../expressions/RelationshipEndPoints.scala   | 16 ++---
 .../expressions/RelationshipFunction.scala    | 12 ++--
 .../RelationshipTypeFunction.scala            | 18 +++---
 .../expressions/ShortestPathExpression.scala  | 22 +++----
 .../expressions/ShortestPathSPI.scala         |  4 +-
 .../commands/expressions/SimpleCase.scala     | 10 +--
 .../commands/expressions/SizeFunction.scala   | 14 ++---
 .../v3_1}/commands/expressions/Stdev.scala    |  8 +--
 .../expressions/StringFunctions.scala         | 12 ++--
 .../v3_1}/commands/expressions/Subtract.scala |  2 +-
 .../v3_1}/commands/expressions/Sum.scala      |  8 +--
 .../expressions/TimestampFunction.scala       |  8 +--
 .../expressions/ToFloatFunction.scala         | 12 ++--
 .../commands/expressions/ToIntFunction.scala  | 12 ++--
 .../expressions/ToStringFunction.scala        |  8 +--
 .../v3_1}/commands/expressions/Variable.scala | 10 +--
 .../compiler/v3_1}/commands/indexQuery.scala  | 14 ++---
 .../v3_1}/commands/predicates/Ands.scala      | 10 +--
 .../predicates/ComparablePredicate.scala      | 12 ++--
 .../v3_1}/commands/predicates/Ors.scala       | 10 +--
 .../v3_1}/commands/predicates/Predicate.scala | 24 +++----
 .../groupInequalityPredicatesForLegacy.scala  |  6 +-
 .../v3_1}/commands/values/KeyToken.scala      | 10 +--
 .../v3_1}/commands/values/TokenType.scala     |  4 +-
 .../CheckForLoadCsvAndMatchOnLargeLabel.scala | 16 ++---
 .../CompiledExecutionResult.scala             | 10 +--
 ...DefaultExecutionResultBuilderFactory.scala | 12 ++--
 .../v3_1}/executionplan/Effects.scala         | 16 ++---
 .../v3_1}/executionplan/EntityAccessor.java   |  2 +-
 .../ErrorReportingExecutablePlanBuilder.scala | 10 +--
 .../v3_1}/executionplan/ExecutionPlan.scala   |  8 +--
 .../executionplan/ExecutionPlanBuilder.scala  | 34 +++++-----
 .../ExecutionResultBuilder.scala              | 10 +--
 .../InternalExecutionResult.scala             | 10 +--
 .../executionplan/InternalQueryType.scala     |  2 +-
 .../LegacyExecutablePlanBuilder.scala         | 30 ++++-----
 .../v3_1}/executionplan/LoadCsvIterator.scala |  2 +-
 .../LoadCsvPeriodicCommitObserver.scala       |  8 +--
 .../v3_1}/executionplan/MatchPattern.scala    |  8 +--
 .../compiler/v3_1}/executionplan/Namer.scala  |  4 +-
 .../executionplan/PartiallySolvedQuery.scala  | 18 +++---
 .../compiler/v3_1}/executionplan/Phase.scala  |  8 +--
 .../v3_1}/executionplan/PlanBuilder.scala     |  6 +-
 .../v3_1}/executionplan/PlanFingerprint.scala |  4 +-
 .../executionplan/ProcedureCallMode.scala     |  4 +-
 .../v3_1}/executionplan/Provider.java         |  2 +-
 .../SilentFallbackPlanBuilder.scala           | 12 ++--
 .../StandardInternalExecutionResult.scala     | 18 +++---
 .../v3_1}/executionplan/UpdateCounter.scala   |  2 +-
 .../addEagernessIfNecessary.scala             |  4 +-
 .../builders/AggregationBuilder.scala         | 14 ++---
 .../builders/ColumnFilterBuilder.scala        | 12 ++--
 ...onnectedShortestPathEndPointsBuilder.scala | 12 ++--
 .../builders/DistinctBuilder.scala            | 10 +--
 .../builders/EmptyResultBuilder.scala         |  8 +--
 .../builders/ExtractBuilder.scala             | 12 ++--
 .../builders/FilterBuilder.scala              | 10 +--
 .../builders/GetGraphElements.scala           |  2 +-
 .../builders/IfElseIterator.scala             |  4 +-
 .../builders/IndexLookupBuilder.scala         | 22 +++----
 .../builders/LoadCSVBuilder.scala             | 10 +--
 .../executionplan/builders/MatchBuilder.scala | 12 ++--
 .../builders/MergeIntoBuilder.scala           | 18 +++---
 .../builders/MergePatternBuilder.scala        | 12 ++--
 .../builders/MergeStartPointBuilder.scala     | 32 +++++-----
 .../builders/NamedPathBuilder.scala           | 10 +--
 .../builders/NodeFetchStrategy.scala          | 16 ++---
 .../builders/OptionalMatchBuilder.scala       |  8 +--
 .../builders/PatternGraphBuilder.scala        | 10 +--
 .../builders/PredicateRewriter.scala          | 18 +++---
 .../builders/QueryStateSettingIterator.scala  |  6 +-
 .../executionplan/builders/QueryToken.scala   |  2 +-
 .../builders/RelationshipByIdBuilder.scala    | 18 +++---
 .../builders/ShortestPathBuilder.scala        | 10 +--
 .../executionplan/builders/SliceBuilder.scala |  8 +--
 .../executionplan/builders/SortBuilder.scala  | 12 ++--
 .../builders/StartPointBuilder.scala          | 14 ++---
 .../builders/StartPointChoosingBuilder.scala  | 18 +++---
 .../builders/TopPipeBuilder.scala             | 14 ++---
 .../executionplan/builders/TrailBuilder.scala | 12 ++--
 .../builders/TraversalMatcherBuilder.scala    | 22 +++----
 .../executionplan/builders/UnionBuilder.scala | 14 ++---
 .../builders/UnwindBuilder.scala              | 10 +--
 .../builders/UpdateActionBuilder.scala        | 12 ++--
 .../builders/UpdateCommandExpander.scala      |  8 +--
 .../builders/prepare/KeyTokenResolver.scala   | 12 ++--
 .../executionplan/checkForEagerLoadCsv.scala  |  8 +--
 .../v3_1}/executionplan/formatOutput.scala    |  4 +-
 ...gatingProcedureExecutablePlanBuilder.scala | 18 +++---
 .../procs/ProcedureCallExecutionPlan.scala    | 22 +++----
 .../procs/ProcedureExecutionResult.scala      | 14 ++---
 .../procs/PureSideEffectExecutionPlan.scala   | 12 ++--
 ...ureSideEffectInternalExecutionResult.scala | 10 +--
 .../executionplan/verifiers/Verifier.scala    |  4 +-
 .../v3_1}/helpers/ArrayBackedMap.scala        |  2 +-
 .../v3_1}/helpers/CachedFunction.scala        |  2 +-
 .../compiler/v3_1}/helpers/CastSupport.scala  |  4 +-
 .../v3_1}/helpers/CollectionSupport.scala     |  2 +-
 .../compiler/v3_1}/helpers/Counter.scala      |  2 +-
 .../v3_1}/helpers/DynamicIterable.scala       |  2 +-
 .../v3_1}/helpers/IteratorSupport.scala       |  2 +-
 .../v3_1}/helpers/JavaConversionSupport.scala |  4 +-
 .../compiler/v3_1}/helpers/LabelSupport.scala |  4 +-
 .../compiler/v3_1}/helpers/LazyIterable.scala |  2 +-
 .../v3_1}/helpers/LiteralTypeSupport.scala    |  4 +-
 .../compiler/v3_1}/helpers/MapSupport.scala   |  6 +-
 .../compiler/v3_1}/helpers/Materialized.scala |  2 +-
 .../helpers/PartialFunctionSupport.scala      |  2 +-
 .../v3_1}/helpers/PrefixNameGenerator.scala   |  4 +-
 .../v3_1}/helpers/PropertySupport.scala       |  8 +--
 .../helpers/RuntimeJavaValueConverter.scala   |  6 +-
 .../helpers/RuntimeScalaValueConverter.scala  |  4 +-
 .../helpers/RuntimeTextValueConverter.scala   |  6 +-
 .../v3_1}/helpers/ScalaCompatibility.scala    |  2 +-
 .../helpers/StringRenderingSupport.scala      |  2 +-
 .../compiler/v3_1}/helpers/Tapper.scala       |  2 +-
 .../v3_1}/helpers/TypeSafeMathSupport.scala   |  4 +-
 .../v3_1}/helpers/ZeroOneOrMany.scala         |  2 +-
 .../compiler/v3_1}/helpers/package.scala      |  2 +-
 .../helpers/simpleExpressionEvaluator.scala   | 16 ++---
 .../compiler/v3_1}/mutation/CreateNode.scala  | 22 +++----
 .../v3_1}/mutation/CreateRelationship.scala   | 20 +++---
 .../v3_1}/mutation/CreateUniqueAction.scala   | 18 +++---
 .../v3_1}/mutation/DeleteEntityAction.scala   | 16 ++---
 .../v3_1}/mutation/DeletePropertyAction.scala | 16 ++---
 .../v3_1}/mutation/ForeachAction.scala        | 12 ++--
 .../GraphElementPropertyFunctions.scala       | 12 ++--
 .../v3_1}/mutation/MapPropertySetAction.scala | 22 +++----
 .../v3_1}/mutation/MergeNodeAction.scala      | 28 ++++-----
 .../v3_1}/mutation/MergePatternAction.scala   | 26 ++++----
 .../v3_1}/mutation/NamedExpectation.scala     | 14 ++---
 .../v3_1}/mutation/PropertySetAction.scala    | 12 ++--
 .../compiler/v3_1}/mutation/SetAction.scala   |  4 +-
 .../compiler/v3_1}/mutation/UniqueLink.scala  | 31 ++++-----
 .../v3_1}/mutation/UpdateAction.scala         | 22 +++----
 .../v3_1}/mutation/makeValueNeoSafe.scala     |  4 +-
 .../v3_1}/pipes/AllNodesScanPipe.scala        | 12 ++--
 .../compiler/v3_1}/pipes/ApplyPipe.scala      | 10 +--
 .../compiler/v3_1}/pipes/ArgumentPipe.scala   | 12 ++--
 .../v3_1}/pipes/AssertSameNodePipe.scala      | 14 ++---
 .../v3_1}/pipes/CachingExpandInto.scala       |  8 +--
 .../v3_1}/pipes/CartesianProductPipe.scala    | 10 +--
 .../v3_1}/pipes/ColumnFilterPipe.scala        | 20 +++---
 .../v3_1}/pipes/ConditionalApplyPipe.scala    | 10 +--
 .../v3_1}/pipes/ConstraintOperationPipe.scala | 18 +++---
 .../compiler/v3_1}/pipes/CreateNodePipe.scala | 20 +++---
 .../v3_1}/pipes/CreateRelationshipPipe.scala  | 20 +++---
 .../compiler/v3_1}/pipes/DeletePipe.scala     | 14 ++---
 .../DirectedRelationshipByIdSeekPipe.scala    | 16 ++---
 .../compiler/v3_1}/pipes/DistinctPipe.scala   | 16 ++---
 .../v3_1}/pipes/EagerAggregationPipe.scala    | 16 ++---
 .../compiler/v3_1}/pipes/EagerPipe.scala      | 10 +--
 .../v3_1}/pipes/EmptyResultPipe.scala         | 12 ++--
 .../compiler/v3_1}/pipes/EntityProducer.scala |  6 +-
 .../compiler/v3_1}/pipes/ErrorPipe.scala      | 10 +--
 .../pipes/ExecuteUpdateCommandsPipe.scala     | 18 +++---
 .../compiler/v3_1}/pipes/ExpandAllPipe.scala  | 12 ++--
 .../compiler/v3_1}/pipes/ExpandIntoPipe.scala | 12 ++--
 .../v3_1}/pipes/ExternalCSVResource.scala     |  2 +-
 .../compiler/v3_1}/pipes/ExtractPipe.scala    | 18 +++---
 .../compiler/v3_1}/pipes/FilterPipe.scala     |  8 +--
 .../compiler/v3_1}/pipes/ForeachPipe.scala    | 16 ++---
 .../compiler/v3_1}/pipes/IdSeekIterator.scala | 10 +--
 .../v3_1}/pipes/IndexOperationPipe.scala      | 14 ++---
 .../compiler/v3_1}/pipes/IndexSeekMode.scala  |  4 +-
 .../compiler/v3_1}/pipes/LazyLabel.scala      |  8 +--
 .../v3_1}/pipes/LazyPropertyKey.scala         |  8 +--
 .../compiler/v3_1}/pipes/LazyType.scala       |  8 +--
 .../compiler/v3_1}/pipes/LazyTypes.scala      |  8 +--
 .../compiler/v3_1}/pipes/LegacySortPipe.scala |  8 +--
 .../pipes/LetSelectOrSemiApplyPipe.scala      | 14 ++---
 .../v3_1}/pipes/LetSemiApplyPipe.scala        | 12 ++--
 .../compiler/v3_1}/pipes/LimitPipe.scala      | 12 ++--
 .../compiler/v3_1}/pipes/LoadCSVPipe.scala    | 20 +++---
 .../compiler/v3_1}/pipes/MatchPipe.scala      |  8 +--
 .../compiler/v3_1}/pipes/MergeIntoPipe.scala  | 22 +++----
 .../compiler/v3_1}/pipes/MutableMaps.scala    |  2 +-
 .../compiler/v3_1}/pipes/NamedPathPipe.scala  | 10 +--
 .../compiler/v3_1}/pipes/NiceHasher.scala     |  2 +-
 .../v3_1}/pipes/NodeByIdSeekPipe.scala        | 18 +++---
 .../pipes/NodeByLabelEntityProducer.scala     |  8 +--
 .../v3_1}/pipes/NodeByLabelScanPipe.scala     | 14 ++---
 .../pipes/NodeCountFromCountStorePipe.scala   | 16 ++---
 .../v3_1}/pipes/NodeHashJoinPipe.scala        | 12 ++--
 .../pipes/NodeIndexContainsScanPipe.scala     | 22 +++----
 .../v3_1}/pipes/NodeIndexScanPipe.scala       | 16 ++---
 .../v3_1}/pipes/NodeIndexSeekPipe.scala       | 24 +++----
 .../v3_1}/pipes/NodeOuterHashJoinPipe.scala   | 10 +--
 .../v3_1}/pipes/OptionalExpandAllPipe.scala   | 14 ++---
 .../v3_1}/pipes/OptionalExpandIntoPipe.scala  | 14 ++---
 .../v3_1}/pipes/OptionalMatchPipe.scala       | 10 +--
 .../compiler/v3_1}/pipes/OptionalPipe.scala   | 10 +--
 .../internal/compiler/v3_1}/pipes/Pipe.scala  | 10 +--
 .../compiler/v3_1}/pipes/PipeDecorator.scala  |  6 +-
 .../v3_1}/pipes/ProcedureCallPipe.scala       | 22 +++----
 .../v3_1}/pipes/ProduceResultsPipe.scala      |  8 +--
 .../v3_1}/pipes/ProjectEndpointsPipe.scala    | 16 ++---
 .../compiler/v3_1}/pipes/ProjectionPipe.scala | 10 +--
 .../compiler/v3_1}/pipes/QueryState.scala     | 10 +--
 .../RelationshipCountFromCountStorePipe.scala | 18 +++---
 .../v3_1}/pipes/RemoveLabelsPipe.scala        | 10 +--
 .../v3_1}/pipes/RepeatableReadPipe.scala      |  8 +--
 .../v3_1}/pipes/RollUpApplyPipe.scala         | 12 ++--
 .../compiler/v3_1}/pipes/RonjaPipe.scala      |  6 +-
 .../v3_1}/pipes/SelectOrSemiApplyPipe.scala   | 12 ++--
 .../compiler/v3_1}/pipes/SemiApplyPipe.scala  | 10 +--
 .../compiler/v3_1}/pipes/SetOperation.scala   | 22 +++----
 .../compiler/v3_1}/pipes/SetPipe.scala        |  4 +-
 .../v3_1}/pipes/ShortestPathPipe.scala        | 18 +++---
 .../compiler/v3_1}/pipes/SkipPipe.scala       | 12 ++--
 .../compiler/v3_1}/pipes/SlicePipe.scala      | 10 +--
 .../compiler/v3_1}/pipes/SortPipe.scala       |  6 +-
 .../compiler/v3_1}/pipes/StartPipe.scala      |  8 +--
 .../compiler/v3_1}/pipes/TopPipe.scala        |  8 +--
 .../v3_1}/pipes/TraversalMatchPipe.scala      | 10 +--
 .../v3_1}/pipes/TriadicSelectionPipe.scala    | 12 ++--
 .../UndirectedRelationshipByIdSeekPipe.scala  | 16 ++---
 .../compiler/v3_1}/pipes/UnionIterator.scala  |  4 +-
 .../compiler/v3_1}/pipes/UnionPipe.scala      | 16 ++---
 .../compiler/v3_1}/pipes/UnwindPipe.scala     | 10 +--
 .../v3_1}/pipes/ValueHashJoinPipe.scala       | 12 ++--
 .../v3_1}/pipes/VarLengthExpandPipe.scala     | 12 ++--
 .../aggregation/AggregationFunction.scala     |  4 +-
 .../v3_1}/pipes/aggregation/AvgFunction.scala |  6 +-
 .../pipes/aggregation/CollectFunction.scala   |  4 +-
 .../pipes/aggregation/CountFunction.scala     |  4 +-
 .../pipes/aggregation/CountStarFunction.scala |  4 +-
 .../pipes/aggregation/DistinctFunction.scala  |  6 +-
 .../v3_1}/pipes/aggregation/MaxFunction.scala | 10 +--
 .../aggregation/NumericExpressionOnly.scala   |  6 +-
 .../aggregation/PercentileFunction.scala      |  4 +-
 .../pipes/aggregation/StdevFunction.scala     |  4 +-
 .../v3_1}/pipes/aggregation/SumFunction.scala |  6 +-
 .../v3_1}/pipes/matching/EndPoint.scala       |  8 +--
 .../v3_1}/pipes/matching/ExpanderStep.scala   | 16 ++---
 .../pipes/matching/GraphRelationship.scala    |  2 +-
 .../v3_1}/pipes/matching/History.scala        |  4 +-
 .../pipes/matching/MatchingContext.scala      | 10 +--
 .../v3_1}/pipes/matching/MatchingPair.scala   |  6 +-
 .../v3_1}/pipes/matching/PatternElement.scala |  2 +-
 .../v3_1}/pipes/matching/PatternGraph.scala   |  8 +--
 .../v3_1}/pipes/matching/PatternMatcher.scala |  6 +-
 .../matching/PatternMatchingBuilder.scala     | 12 ++--
 .../v3_1}/pipes/matching/PatternNode.scala    |  8 +--
 .../pipes/matching/PatternRelationship.scala  | 18 +++---
 .../SimplePatternMatcherBuilder.scala         | 12 ++--
 .../v3_1}/pipes/matching/SingleStep.scala     | 12 ++--
 .../pipes/matching/SingleStepTrail.scala      | 12 ++--
 .../compiler/v3_1}/pipes/matching/Trail.scala |  8 +--
 .../pipes/matching/TraversalMatcher.scala     |  6 +-
 .../matching/TraversalPathExpander.scala      |  6 +-
 .../v3_1}/pipes/matching/VarLengthStep.scala  | 12 ++--
 .../matching/VariableLengthStepTrail.scala    | 18 +++---
 .../InternalPlanDescription.scala             | 16 ++---
 .../PlanDescriptionArgumentSerializer.scala   | 10 +--
 .../planDescription/renderAsTreeTable.scala   |  4 +-
 .../v3_1}/planDescription/renderSummary.scala |  2 +-
 .../planner/CantCompileQueryException.scala   |  6 +-
 .../planner/CantHandleQueryException.scala    |  6 +-
 .../CostBasedExecutablePlanBuilder.scala      | 36 +++++------
 .../planner/CostBasedPipeBuilderFactory.scala | 12 ++--
 .../v3_1}/planner/CreatesPropertyKeys.scala   |  4 +-
 .../v3_1}/planner/MutatingPattern.scala       |  8 +--
 .../compiler/v3_1}/planner/PlannerQuery.scala | 10 +--
 .../compiler/v3_1}/planner/QueryGraph.scala   |  8 +--
 .../v3_1}/planner/QueryProjection.scala       | 16 ++---
 .../compiler/v3_1}/planner/Selections.scala   |  8 +--
 .../v3_1}/planner/SimpleTokenResolver.scala   | 10 +--
 .../compiler/v3_1}/planner/UpdateGraph.scala  |  6 +-
 .../planner/checkForUnresolvedTokens.scala    |  8 +--
 .../PipeExecutionBuilderContext.scala         |  8 +--
 .../execution/PipeExecutionPlanBuilder.scala  | 42 ++++++-------
 .../logical/CachedMetricsFactory.scala        |  8 +--
 .../logical/CardinalityCostModel.scala        |  8 +--
 .../v3_1}/planner/logical/Eagerness.scala     | 10 +--
 .../planner/logical/LeafPlannerIterable.scala |  6 +-
 .../logical/LogicalPlan2PlanDescription.scala | 10 +--
 .../LogicalPlanIdentificationBuilder.scala    |  8 +--
 .../logical/LogicalPlanningContext.scala      | 16 ++---
 .../logical/LogicalPlanningFunction.scala     |  6 +-
 .../logical/LogicalPlanningSupport.scala      |  6 +-
 .../v3_1}/planner/logical/Metrics.scala       | 18 +++---
 ...PatternExpressionPatternElementNamer.scala |  8 +--
 .../planner/logical/PlanEventHorizon.scala    |  8 +--
 .../planner/logical/PlanSingleQuery.scala     |  8 +--
 .../v3_1}/planner/logical/PlanUpdates.scala   | 10 +--
 .../v3_1}/planner/logical/PlanWithTail.scala  |  6 +-
 .../planner/logical/ProjectingSelector.scala  |  2 +-
 .../planner/logical/QueryGraphSolver.scala    | 12 ++--
 .../v3_1}/planner/logical/QueryPlanner.scala  |  8 +--
 .../logical/QueryPlannerConfiguration.scala   | 12 ++--
 .../logical/SimpleMetricsFactory.scala        |  8 +--
 .../v3_1}/planner/logical/Solvable.scala      |  6 +-
 .../planner/logical/SortDescription.scala     |  4 +-
 .../StatisticsBackedCardinalityModel.scala    | 20 +++---
 .../ExpressionSelectivityCalculator.scala     | 18 +++---
 .../NodeCardinalityEstimator.scala            | 12 ++--
 .../QueryGraphCardinalityModel.scala          |  8 +--
 .../cardinality/SelectivityCombiner.scala     |  4 +-
 .../cardinality/SelectivityEstimator.scala    | 12 ++--
 .../logical/cardinality/TokenSpec.scala       |  8 +--
 ...dependenceQueryGraphCardinalityModel.scala | 20 +++---
 .../PatternSelectivityCalculator.scala        | 18 +++---
 .../OptionalQueryGraphCardinalityModel.scala  | 10 +--
 .../SimpleTripletCardinalityEstimator.scala   | 16 ++---
 .../logical/cardinality/triplet/Triplet.scala | 12 ++--
 .../triplet/TripletConverter.scala            | 16 ++---
 .../TripletQueryGraphCardinalityModel.scala   | 22 +++----
 .../triplet/calculateOverlapCardinality.scala |  8 +--
 .../logical/idp/AdaptiveSolverStep.scala      |  8 +--
 .../v3_1}/planner/logical/idp/IDPCache.scala  |  2 +-
 .../planner/logical/idp/IDPPlanTable.scala    |  6 +-
 .../logical/idp/IDPQueryGraphSolver.scala     | 10 +--
 .../v3_1}/planner/logical/idp/IDPSolver.scala |  6 +-
 .../planner/logical/idp/IDPSolverConfig.scala |  8 +--
 .../planner/logical/idp/IDPSolverStep.scala   |  2 +-
 .../v3_1}/planner/logical/idp/IDPTable.scala  |  2 +-
 .../planner/logical/idp/IdRegistry.scala      |  2 +-
 .../logical/idp/SingleComponentPlanner.scala  | 18 +++---
 .../idp/cartesianProductsOrValueJoins.scala   | 10 +--
 .../logical/idp/expandSolverStep.scala        | 12 ++--
 .../planner/logical/idp/joinSolverStep.scala  | 10 +--
 .../v3_1}/planner/logical/idp/package.scala   |  2 +-
 .../v3_1}/planner/logical/package.scala       |  4 +-
 .../logical/patternExpressionRewriter.scala   | 12 ++--
 .../planner/logical/plans/Aggregation.scala   |  6 +-
 .../planner/logical/plans/AllNodesScan.scala  |  4 +-
 .../logical/plans/AntiConditionalApply.scala  |  4 +-
 .../v3_1}/planner/logical/plans/Apply.scala   |  4 +-
 .../planner/logical/plans/Argument.scala      |  8 +--
 .../logical/plans/AssertSameNode.scala        |  4 +-
 .../logical/plans/CartesianProduct.scala      |  4 +-
 .../logical/plans/ConditionalApply.scala      |  4 +-
 .../planner/logical/plans/CreateNode.scala    |  6 +-
 .../logical/plans/CreateRelationship.scala    |  6 +-
 .../logical/plans/DeleteExpression.scala      |  6 +-
 .../planner/logical/plans/DeleteNode.scala    |  6 +-
 .../planner/logical/plans/DeletePath.scala    |  6 +-
 .../logical/plans/DeleteRelationship.scala    |  6 +-
 .../plans/DetachDeleteExpression.scala        |  6 +-
 .../logical/plans/DetachDeleteNode.scala      |  6 +-
 .../logical/plans/DetachDeletePath.scala      |  6 +-
 .../plans/DirectedRelationshipByIdSeek.scala  |  4 +-
 .../v3_1}/planner/logical/plans/Eager.scala   |  4 +-
 .../planner/logical/plans/EmptyResult.scala   |  4 +-
 .../planner/logical/plans/ErrorPlan.scala     |  4 +-
 .../v3_1}/planner/logical/plans/Expand.scala  |  8 +--
 .../logical/plans/FindShortestPaths.scala     |  6 +-
 .../planner/logical/plans/ForeachApply.scala  |  6 +-
 .../logical/plans/LegacyIndexSeek.scala       |  6 +-
 .../logical/plans/LetSelectOrSemiApply.scala  |  6 +-
 .../planner/logical/plans/LetSemiApply.scala  |  4 +-
 .../v3_1}/planner/logical/plans/Limit.scala   |  6 +-
 .../v3_1}/planner/logical/plans/LoadCSV.scala |  8 +--
 .../planner/logical/plans/LogicalPlan.scala   | 14 ++---
 .../logical/plans/MergeCreateNode.scala       |  6 +-
 .../plans/MergeCreateRelationship.scala       |  8 +--
 .../planner/logical/plans/NodeByIdSeek.scala  |  4 +-
 .../logical/plans/NodeByLabelScan.scala       |  6 +-
 .../plans/NodeCountFromCountStore.scala       |  6 +-
 .../planner/logical/plans/NodeHashJoin.scala  |  4 +-
 .../logical/plans/NodeIndexContainsScan.scala |  6 +-
 .../logical/plans/NodeIndexEndsWithScan.scala |  6 +-
 .../planner/logical/plans/NodeIndexScan.scala |  6 +-
 .../planner/logical/plans/NodeIndexSeek.scala |  8 +--
 .../logical/plans/NodeUniqueIndexSeek.scala   |  8 +--
 .../planner/logical/plans/NonSargable.scala   |  4 +-
 .../planner/logical/plans/Optional.scala      |  4 +-
 .../planner/logical/plans/OuterHashJoin.scala |  4 +-
 .../logical/plans/PatternRelationship.scala   |  6 +-
 .../planner/logical/plans/ProcedureCall.scala |  6 +-
 .../planner/logical/plans/ProduceResult.scala |  2 +-
 .../logical/plans/ProjectEndpoints.scala      |  6 +-
 .../planner/logical/plans/Projection.scala    |  6 +-
 .../RelationshipCountFromCountStore.scala     |  8 +--
 .../planner/logical/plans/RemoveLabels.scala  |  6 +-
 .../logical/plans/RepeatableRead.scala        |  4 +-
 .../planner/logical/plans/RollUpApply.scala   |  4 +-
 .../planner/logical/plans/Sargable.scala      | 20 +++---
 .../v3_1}/planner/logical/plans/SeekRhs.scala | 10 +--
 .../logical/plans/SelectOrSemiApply.scala     |  6 +-
 .../planner/logical/plans/Selection.scala     |  6 +-
 .../planner/logical/plans/SemiApply.scala     |  4 +-
 .../planner/logical/plans/SetLabels.scala     |  6 +-
 .../plans/SetNodePropertiesFromMap.scala      |  6 +-
 .../logical/plans/SetNodeProperty.scala       |  6 +-
 .../SetRelationshipPropertiesFromMap.scala    |  6 +-
 .../plans/SetRelationshipPropery.scala        |  6 +-
 .../planner/logical/plans/SingleRow.scala     |  4 +-
 .../v3_1}/planner/logical/plans/Skip.scala    |  6 +-
 .../v3_1}/planner/logical/plans/Sort.scala    |  6 +-
 .../planner/logical/plans/Strictness.scala    |  2 +-
 .../logical/plans/TriadicSelection.scala      |  4 +-
 .../UndirectedRelationshipByIdSeek.scala      |  4 +-
 .../v3_1}/planner/logical/plans/Union.scala   |  4 +-
 .../logical/plans/UnwindCollection.scala      |  6 +-
 .../planner/logical/plans/ValueHashJoin.scala |  6 +-
 .../plans/rewriter/LogicalPlanRewriter.scala  |  8 +--
 .../logical/plans/rewriter/cleanUpEager.scala |  6 +-
 .../plans/rewriter/fuseSelections.scala       |  6 +-
 .../predicateRemovalThroughJoins.scala        | 10 +--
 .../plans/rewriter/removeIdenticalPlans.scala |  8 +--
 .../plans/rewriter/simplifyEquality.scala     |  6 +-
 .../logical/plans/rewriter/unnestApply.scala  |  6 +-
 .../plans/rewriter/unnestOptional.scala       | 12 ++--
 .../steps/DynamicPropertyNotifier.scala       | 12 ++--
 .../logical/steps/IndexSeekLeafPlanner.scala  | 18 +++---
 .../logical/steps/LogicalPlanProducer.scala   | 26 ++++----
 .../steps/PatternExpressionSolver.scala       | 24 +++----
 .../planner/logical/steps/Selector.scala      |  8 +--
 .../planner/logical/steps/aggregation.scala   | 10 +--
 .../logical/steps/allNodesLeafPlanner.scala   |  6 +-
 .../logical/steps/argumentLeafPlanner.scala   |  6 +-
 .../logical/steps/countStorePlanner.scala     | 16 ++---
 .../logical/steps/getDegreeRewriter.scala     |  8 +--
 .../logical/steps/idSeekLeafPlanner.scala     | 12 ++--
 .../logical/steps/indexScanLeafPlanner.scala  | 14 ++---
 .../logical/steps/labelScanLeafPlanner.scala  |  8 +--
 .../logical/steps/leafPlanOptions.scala       |  8 +--
 .../mergeUniqueIndexSeekLeafPlanner.scala     | 12 ++--
 .../steps/pickBestPlanUsingHintsAndCost.scala |  6 +-
 .../logical/steps/planShortestPaths.scala     | 24 +++----
 .../planner/logical/steps/projection.scala    | 10 +--
 .../planner/logical/steps/selectCovered.scala |  8 +--
 .../steps/selectHasLabelWithJoin.scala        | 10 +--
 .../steps/selectPatternPredicates.scala       | 12 ++--
 .../logical/steps/solveOptionalMatches.scala  | 10 +--
 .../logical/steps/sortSkipAndLimit.scala      | 12 ++--
 .../steps/triadicSelectionFinder.scala        | 16 ++---
 .../logical/steps/verifyBestPlan.scala        | 16 ++---
 .../compiler/v3_1}/planner/package.scala      |  2 +-
 .../v3_1}/prettifier/Prettifier.scala         |  6 +-
 .../compiler/v3_1}/profiler/Profiler.scala    | 16 ++---
 .../compiler/v3_1}/repeatWithSizeLimit.scala  |  8 +--
 .../v3_1}/rewriteProcedureCalls.scala         | 10 +--
 .../compiler/v3_1}/spi/CSVResources.scala     |  8 +--
 .../v3_1}/spi/DelegatingQueryContext.scala    |  8 +--
 .../compiler/v3_1}/spi/GraphStatistics.scala  |  6 +-
 .../compiler/v3_1}/spi/IdempotentResult.scala |  2 +-
 .../spi/InstrumentedGraphStatistics.scala     |  6 +-
 .../compiler/v3_1}/spi/PlanContext.scala      |  6 +-
 .../v3_1}/spi/ProcedureCallMode.scala         |  4 +-
 .../v3_1}/spi/ProcedureSignature.scala        |  6 +-
 .../compiler/v3_1}/spi/QueryContext.scala     | 10 +--
 .../compiler/v3_1}/spi/TokenContext.scala     |  2 +-
 .../spi/UpdateCountingQueryContext.scala      |  6 +-
 .../compiler/v3_1}/symbols/SymbolTable.scala  |  6 +-
 .../symbols/SymbolTypeAssertionCompiler.scala |  8 +--
 .../tracing/rewriters/RewriterCondition.scala |  4 +-
 .../tracing/rewriters/RewriterStep.scala      |  4 +-
 .../rewriters/RewriterStepSequencer.scala     |  4 +-
 .../tracing/rewriters/RewriterTask.scala      |  4 +-
 .../rewriters/RewriterTaskBuilder.scala       |  4 +-
 .../rewriters/RewriterTaskProcessor.scala     |  4 +-
 .../v3_1}/codegen/SetStaticFieldTest.java     |  2 +-
 .../compiler/v3_1}/pipes/ErrorPipeTest.scala  |  4 +-
 .../compiler/v3_1}/ClosingIteratorTest.scala  |  6 +-
 .../compiler/v3_1}/IdentityMapTest.scala      |  6 +-
 .../compiler/v3_1}/InputPositionTest.scala    |  6 +-
 .../compiler/v3_1}/LRUCacheTest.scala         | 14 ++---
 .../compiler/v3_1}/NullOrderingTest.scala     |  6 +-
 .../v3_1}/RewriteProcedureCallsTest.scala     | 12 ++--
 .../internal/compiler/v3_1}/ScopeTest.scala   |  6 +-
 .../compiler/v3_1}/ScopeTreeTest.scala        | 12 ++--
 .../v3_1}/ScopeTreeVerificationTest.scala     |  8 +--
 .../compiler/v3_1}/SeekRangeTest.scala        |  8 +--
 .../v3_1}/SemanticCheckableTest.scala         | 10 +--
 .../compiler/v3_1}/SemanticStateTest.scala    | 10 +--
 .../compiler/v3_1}/TaskCloserTest.scala       |  4 +-
 .../internal/compiler/v3_1}/TypeTest.scala    |  8 +--
 .../compiler/v3_1}/ast/CallClauseTest.scala   | 12 ++--
 .../v3_1}/ast/FilteringExpressionTest.scala   | 18 +++---
 .../compiler/v3_1}/ast/QueryTaggerTest.scala  |  4 +-
 .../compiler/v3_1}/ast/QueryTagsTest.scala    |  4 +-
 .../AggregationsAreIsolatedTest.scala         |  6 +-
 .../conditions/CollectNodesOfTypeTest.scala   |  6 +-
 ...ainsNamedPathOnlyForShortestPathTest.scala |  6 +-
 .../ContainsNoMatchingNodesTest.scala         |  6 +-
 .../ContainsNoNodesOfTypeTest.scala           |  6 +-
 .../NoDuplicatesInReturnItemsTest.scala       |  6 +-
 ...oReferenceEqualityAmongVariablesTest.scala |  6 +-
 .../NoUnnamedPatternElementsInMatchTest.scala |  8 +--
 .../NormalizedEqualsArgumentsTest.scala       |  6 +-
 .../OrderByOnlyOnVariablesTest.scala          |  8 +--
 .../GroupInequalityPredicatesTest.scala       | 12 ++--
 .../MutatingStatementConvertersTest.scala     | 16 ++---
 .../PatternExpressionConverterTest.scala      | 16 ++---
 .../StatementConvertersTest.scala             | 18 +++---
 .../UnionStatementConvertersTest.scala        |  8 +--
 .../AddUniquenessPredicatesTest.scala         |  6 +-
 .../ast/rewriters/CNFNormalizerTest.scala     |  8 +--
 .../rewriters/CollapseInCollectionsTest.scala |  8 +--
 .../ast/rewriters/DeMorganRewriterTest.scala  |  8 +--
 .../rewriters/DistributeLawRewriterTest.scala | 10 +--
 .../v3_1}/ast/rewriters/ExpandStarTest.scala  | 10 +--
 .../FlattenBooleanOperatorsTest.scala         |  4 +-
 .../ast/rewriters/FoldConstantsTest.scala     |  6 +-
 .../ast/rewriters/InlineProjectionsTest.scala | 10 +--
 .../InliningContextCreatorTest.scala          |  6 +-
 .../ast/rewriters/InliningContextTest.scala   |  8 +--
 .../rewriters/IsolateAggregationTest.scala    | 10 +--
 .../rewriters/LiteralReplacementTest.scala    | 12 ++--
 .../MatchPredicateNormalizerTest.scala        |  6 +-
 .../NameMatchPatternElementTest.scala         |  6 +-
 .../v3_1}/ast/rewriters/NamespacerTest.scala  | 18 +++---
 .../NormalizeArgumentOrderTest.scala          |  6 +-
 .../rewriters/NormalizeComparisonsTest.scala  |  8 +--
 .../rewriters/NormalizeNotEqualsTest.scala    |  8 +--
 .../NormalizeReturnClausesTest.scala          | 10 +--
 .../NormalizeSargablePredicatesTest.scala     |  8 +--
 .../rewriters/NormalizeWithClausesTest.scala  | 10 +--
 .../ast/rewriters/PredicateSplitterTest.scala |  6 +-
 .../ast/rewriters/PredicateTestSupport.scala  |  8 +--
 .../ProjectFreshSortExpressionsTest.scala     | 10 +--
 .../ast/rewriters/ProjectNamedPathsTest.scala | 12 ++--
 .../ReattachAliasedExpressionsTest.scala      |  6 +-
 ...aceLiteralDynamicPropertyLookupsTest.scala |  6 +-
 .../RewriteEqualityToInCollectionTest.scala   |  8 +--
 .../v3_1}/ast/rewriters/RewriteTest.scala     | 10 +--
 .../rewriters/SimplifyPredicatesTest.scala    |  4 +-
 .../v3_1}/codegen/ResultRowImplTest.scala     |  4 +-
 .../CodeGenExpressionTypesTest.scala          |  8 +--
 .../profiling/ProfilingTracerTest.scala       |  6 +-
 .../compiler/v3_1}/commands/AddTest.scala     | 12 ++--
 .../v3_1}/commands/AllVariablesTest.scala     | 10 +--
 .../compiler/v3_1}/commands/AndsTest.scala    | 12 ++--
 .../v3_1}/commands/CoalesceTest.scala         | 14 ++---
 .../v3_1}/commands/CoercedPredicateTest.scala | 12 ++--
 .../v3_1}/commands/CollectionTest.scala       | 12 ++--
 .../commands/ComparablePredicateTest.scala    | 12 ++--
 .../v3_1}/commands/CreateUniqueAstTest.scala  | 12 ++--
 .../compiler/v3_1}/commands/ExtractTest.scala | 10 +--
 .../v3_1}/commands/HasLabelTests.scala        | 14 ++---
 .../v3_1}/commands/LengthFunctionTest.scala   | 10 +--
 .../v3_1}/commands/MatchPatternTest.scala     |  6 +-
 .../v3_1}/commands/MathFunctionsTest.scala    | 12 ++--
 .../v3_1}/commands/MergeAstTest.scala         | 18 +++---
 .../compiler/v3_1}/commands/OrsTest.scala     | 12 ++--
 .../PropertyValueComparisonTest.scala         | 12 ++--
 .../compiler/v3_1}/commands/ReduceTest.scala  | 16 ++---
 .../RegularExpressionPredicateTest.scala      | 10 +--
 .../v3_1}/commands/SizeFunctionTest.scala     | 12 ++--
 .../commands/SplittingPredicateTest.scala     |  8 +--
 .../v3_1}/commands/SubtractTest.scala         | 12 ++--
 .../commands/expressions/CoerceToTest.scala   | 18 +++---
 .../CollectionSliceExpressionTest.scala       |  8 +--
 .../commands/expressions/CollectionTest.scala |  8 +--
 .../expressions/ContainerIndexTest.scala      | 14 ++---
 .../commands/expressions/DivideTest.scala     | 18 +++---
 .../commands/expressions/ExpressionTest.scala | 22 +++----
 .../expressions/ExtractFunctionTest.scala     |  8 +--
 .../expressions/FakeEntityTestSupport.scala   |  2 +-
 .../expressions/GenericCaseTest.scala         | 10 +--
 .../expressions/KeysFunctionTest.scala        | 10 +--
 .../expressions/LabelsFunctionTest.scala      | 10 +--
 .../commands/expressions/LiteralTest.scala    |  8 +--
 .../commands/expressions/PathImplTest.scala   |  6 +-
 .../expressions/PathValueBuilderTest.scala    |  4 +-
 .../expressions/PropertiesFunctionTest.scala  | 12 ++--
 .../expressions/RangeFunctionTest.scala       |  8 +--
 .../RelationshipTypeFunctionTest.scala        | 10 +--
 .../commands/expressions/SimpleCaseTest.scala |  8 +--
 .../expressions/SplitFunctionTest.scala       |  8 +--
 .../expressions/StringFunctionsTest.scala     | 10 +--
 .../expressions/ToFloatFunctionTest.scala     | 10 +--
 .../expressions/ToIntFunctionTest.scala       | 10 +--
 .../expressions/ToStringFunctionTest.scala    | 10 +--
 ...oupInequalityPredicatesForLegacyTest.scala | 12 ++--
 .../v3_1}/commands/values/KeyTokenTest.scala  |  6 +-
 .../AddEagernessIfNecessaryTest.scala         | 12 ++--
 .../CheckForEagerLoadCsvTest.scala            | 10 +--
 ...ckForLoadCsvAndMatchOnLargeLabelTest.scala | 18 +++---
 .../CompiledExecutionResultTest.scala         | 12 ++--
 .../v3_1}/executionplan/EffectsTest.scala     |  4 +-
 .../ExecutionWorkflowBuilderTest.scala        | 10 +--
 .../FallbackPlanBuilderTest.scala             | 14 ++---
 .../executionplan/LoadCsvIteratorTest.scala   |  4 +-
 .../LoadCsvPeriodicCommitObserverTest.scala   |  8 +--
 .../PartiallySolvedQueryTest.scala            | 16 ++---
 .../PlanFingerprintReferenceTest.scala        |  8 +--
 .../v3_1}/executionplan/QueryTest.scala       |  8 +--
 .../RuleExecutablePlanBuilderTest.scala       | 18 +++---
 .../builders/AggregationBuilderTest.scala     |  8 +--
 .../executionplan/builders/BuilderTest.scala  | 20 +++---
 .../builders/ColumnFilterBuilderTest.scala    |  8 +--
 .../builders/CreateMissingNodesTest.scala     | 16 ++---
 .../DeleteAndPropertySetBuilderTest.scala     | 10 +--
 ...ctedShortestPathEndPointsBuilderTest.scala | 10 +--
 .../builders/DistinctBuilderTest.scala        | 12 ++--
 .../builders/EmptyResultBuilderTest.scala     | 16 ++---
 .../builders/EntityProducerFactoryTest.scala  | 16 ++---
 .../builders/ExtractBuilderTest.scala         | 12 ++--
 .../builders/FilterBuilderTest.scala          | 12 ++--
 .../builders/IfElseIteratorTest.scala         |  6 +-
 .../builders/IndexLookupBuilderTest.scala     | 28 ++++-----
 .../builders/LoadCSVBuilderTest.scala         | 10 +--
 .../builders/MatchBuilderTest.scala           | 10 +--
 .../builders/MergeIntoBuilderTest.scala       | 12 ++--
 .../builders/MergeStartPointBuilderTest.scala | 20 +++---
 .../builders/NamedPathBuilderTest.scala       | 12 ++--
 .../builders/NodeFetchStrategyTest.scala      | 26 ++++----
 .../builders/PatternGraphBuilderTest.scala    | 12 ++--
 .../builders/PredicateRewriterTest.scala      | 16 ++---
 .../builders/ShortestPathBuilderTest.scala    |  8 +--
 .../builders/SliceBuilderTest.scala           |  8 +--
 .../builders/SortBuilderTest.scala            | 12 ++--
 .../builders/StartPointBuilderTest.scala      | 22 +++----
 .../StartPointChoosingBuilderTest.scala       | 28 ++++-----
 .../TopExecutablePlanBuilderTest.scala        |  8 +--
 .../builders/TrailBuilderTest.scala           | 18 +++---
 .../builders/TrailToStepTest.scala            | 18 +++---
 .../builders/UnwindBuilderTest.scala          |  8 +--
 .../builders/UpdateActionBuilderTest.scala    | 10 +--
 .../builders/UpdateCommandExpanderTest.scala  | 12 ++--
 .../prepare/KeyTokenResolverTest.scala        | 22 +++----
 .../ProcedureCallExecutionPlanTest.scala      | 14 ++---
 .../v3_1}/helpers/ArrayBackedMapTest.scala    |  4 +-
 .../v3_1}/helpers/CachedFunctionTest.scala    |  8 +--
 .../compiler/v3_1}/helpers/CounterTest.scala  |  4 +-
 .../compiler/v3_1}/helpers/EagerlyTest.scala  |  6 +-
 .../v3_1}/helpers/LazyIterableTest.scala      |  4 +-
 .../helpers/RowIteratorVisitationTest.scala   |  6 +-
 .../helpers/ScalaCompatibilityTest.scala      |  6 +-
 .../v3_1}/helpers/ScopeTestHelper.scala       |  6 +-
 .../v3_1}/helpers/SemanticTableHelper.scala   |  4 +-
 .../v3_1}/helpers/StatementHelper.scala       |  6 +-
 .../v3_1}/helpers/TreeZipperTest.scala        |  6 +-
 .../v3_1}/helpers/ZeroOneOrManyTest.scala     |  4 +-
 .../v3_1}/mutation/ForeachActionTest.scala    |  8 +--
 .../GraphElementPropertyFunctionsTest.scala   |  4 +-
 .../mutation/MakeValuesNeoSafeTest.scala      |  6 +-
 ...atternActionNullPropertyHandlingTest.scala | 14 ++---
 .../v3_1}/mutation/UniqueLinkTest.scala       | 12 ++--
 .../mutation/UpdateActionEffectfulTest.scala  | 22 +++----
 .../v3_1}/parser/CaseExpressionTest.scala     | 12 ++--
 .../v3_1}/parser/ConstraintTest.scala         | 10 +--
 .../v3_1}/parser/CypherParserTest.scala       | 28 ++++-----
 .../v3_1}/parser/ExpressionsTest.scala        | 16 ++---
 .../v3_1}/parser/ListComprehensionTest.scala  | 14 ++---
 .../v3_1}/parser/MapLiteralTest.scala         | 10 +--
 .../compiler/v3_1}/parser/MergeTest.scala     | 18 +++---
 .../compiler/v3_1}/parser/ParserFixture.scala |  4 +-
 .../v3_1}/parser/PatternPartTest.scala        | 12 ++--
 .../v3_1}/parser/PeriodicCommitHintTest.scala |  6 +-
 .../v3_1}/pipes/AllNodesScanPipeTest.scala    |  6 +-
 .../compiler/v3_1}/pipes/ApplyPipeTest.scala  |  8 +--
 .../v3_1}/pipes/ArgumentPipeTest.scala        | 12 ++--
 .../v3_1}/pipes/ColumnFilterPipeTest.scala    | 10 +--
 ...DirectedRelationshipByIdSeekPipeTest.scala | 10 +--
 .../v3_1}/pipes/DistinctPipeTest.scala        |  8 +--
 .../pipes/EagerAggregationPipeTest.scala      | 12 ++--
 .../compiler/v3_1}/pipes/EagerPipeTest.scala  |  6 +-
 .../v3_1}/pipes/ExpandAllPipeTest.scala       | 14 ++---
 .../v3_1}/pipes/ExpandIntoPipeTest.scala      |  8 +--
 .../compiler/v3_1}/pipes/FakePipe.scala       | 12 ++--
 .../pipes/LazyGroupingIteratorTest.scala      |  4 +-
 .../compiler/v3_1}/pipes/LazyIterator.scala   |  2 +-
 .../v3_1}/pipes/LazyPropertyKeyTest.scala     | 10 +--
 .../compiler/v3_1}/pipes/LazyTypesTest.scala  |  6 +-
 .../pipes/LetSelectOrSemiApplyPipeTest.scala  | 10 +--
 .../v3_1}/pipes/LetSemiApplyPipeTest.scala    |  6 +-
 .../v3_1}/pipes/MergeIntoPipeTest.scala       | 22 +++----
 .../compiler/v3_1}/pipes/NiceHasherTest.scala |  4 +-
 .../v3_1}/pipes/NodeByIdSeekPipeTest.scala    |  8 +--
 .../v3_1}/pipes/NodeByLabelScanPipeTest.scala | 10 +--
 .../NodeCountFromCountStorePipeTest.scala     | 10 +--
 .../v3_1}/pipes/NodeHashJoinPipeTest.scala    | 12 ++--
 .../v3_1}/pipes/NodeIndexScanPipeTest.scala   | 10 +--
 .../v3_1}/pipes/NodeIndexSeekPipeTest.scala   | 16 ++---
 .../pipes/NodeOuterHashJoinPipeTest.scala     | 12 ++--
 .../pipes/OptionalExpandAllPipeTest.scala     | 16 ++---
 .../pipes/OptionalExpandIntoPipeTest.scala    | 16 ++---
 .../v3_1}/pipes/OptionalPipeTest.scala        |  6 +-
 .../v3_1}/pipes/PipeEffectsTest.scala         | 22 +++----
 .../v3_1}/pipes/PipeTestSupport.scala         | 16 ++---
 .../v3_1}/pipes/ProcedureCallPipeTest.scala   | 18 +++---
 .../v3_1}/pipes/ProduceResultsPipeTest.scala  |  8 +--
 .../pipes/ProjectEndpointsPipeTest.scala      | 12 ++--
 .../v3_1}/pipes/QueryStateHelper.scala        |  6 +-
 .../compiler/v3_1}/pipes/QueryStateTest.scala |  4 +-
 ...ationshipCountFromCountStorePipeTest.scala | 12 ++--
 .../v3_1}/pipes/RollUpApplyPipeTest.scala     |  8 +--
 .../v3_1}/pipes/RuleSortPipeTest.scala        | 12 ++--
 .../pipes/SelectOrSemiApplyPipeTest.scala     | 10 +--
 .../v3_1}/pipes/SemiApplyPipeTest.scala       |  6 +-
 .../v3_1}/pipes/SetPropertyPipeTest.scala     | 14 ++---
 .../compiler/v3_1}/pipes/SlicePipeTest.scala  |  8 +--
 .../compiler/v3_1}/pipes/SortPipeTest.scala   |  6 +-
 .../pipes/StartPipePlanDescriptionTest.scala  | 12 ++--
 .../v3_1}/pipes/Top1WithTiesPipeTest.scala    |  8 +--
 .../compiler/v3_1}/pipes/TopPipeTest.scala    |  8 +--
 .../pipes/TriadicSelectionPipeTest.scala      |  8 +--
 ...DirectedRelationshipByIdSeekPipeTest.scala | 10 +--
 .../v3_1}/pipes/UnionIteratorTest.scala       |  4 +-
 .../compiler/v3_1}/pipes/UnionPipeTest.scala  |  6 +-
 .../compiler/v3_1}/pipes/UnwindPipeTest.scala |  8 +--
 .../v3_1}/pipes/ValueHashJoinPipeTest.scala   | 14 ++---
 .../v3_1}/pipes/VarLengthExpandPipeTest.scala | 14 ++---
 .../pipes/aggregation/AggregateTest.scala     |  8 +--
 .../pipes/aggregation/AvgFunctionTest.scala   |  6 +-
 .../aggregation/CollectFunctionTest.scala     |  6 +-
 .../v3_1}/pipes/aggregation/CountTest.scala   |  6 +-
 .../pipes/aggregation/MaxFunctionTest.scala   |  8 +--
 .../pipes/aggregation/MinFunctionTest.scala   |  8 +--
 .../aggregation/PercentileFunctionsTest.scala | 10 +--
 .../pipes/aggregation/StdevFunctionTest.scala | 10 +--
 .../pipes/aggregation/SumFunctionTest.scala   |  8 +--
 .../matching/ExpanderStepReversalTest.scala   | 18 +++---
 .../v3_1}/pipes/matching/HistoryTest.scala    |  8 +--
 .../matching/PatternRelationshipTest.scala    |  8 +--
 .../v3_1}/pipes/matching/StepSizeTest.scala   |  8 +--
 ...riableLengthExpanderStepReversalTest.scala |  8 +--
 .../InternalPlanDescriptionTest.scala         |  6 +-
 ...anDescriptionArgumentSerializerTests.scala |  8 +--
 .../planDescription/RenderSummaryTest.scala   |  8 +--
 .../planDescription/RenderTreeTableTest.scala | 16 ++---
 .../planner/AstRewritingTestSupport.scala     |  8 +--
 .../v3_1}/planner/BeLikeMatcher.scala         |  2 +-
 .../CheckForUnresolvedTokensTest.scala        | 10 +--
 .../planner/DbStructureGraphStatistics.scala  |  8 +--
 ...tructureLogicalPlanningConfiguration.scala |  6 +-
 .../LogicalPlanConstructionTestSupport.scala  |  6 +-
 .../LogicalPlanningConfiguration.scala        | 14 ++---
 .../planner/LogicalPlanningTestSupport.scala  | 34 +++++-----
 .../planner/LogicalPlanningTestSupport2.scala | 42 ++++++-------
 .../v3_1}/planner/PlannerQueryTest.scala      |  8 +--
 .../v3_1}/planner/QueryGraphTest.scala        |  8 +--
 .../RealLogicalPlanningConfiguration.scala    | 14 ++---
 .../v3_1}/planner/SelectionsTest.scala        |  8 +--
 .../v3_1}/planner/SemanticTableBuilder.scala  |  6 +-
 .../v3_1}/planner/SemanticTableTest.scala     | 10 +--
 .../planner/SimpleTokenResolverTest.scala     | 12 ++--
 .../StubbedLogicalPlanningConfiguration.scala | 14 ++---
 .../v3_1}/planner/UpdateGraphTest.scala       | 10 +--
 ...peExecutionPlanBuilderAcceptanceTest.scala | 30 ++++-----
 .../PipeExecutionPlanBuilderTest.scala        | 20 +++---
 .../PathExpressionConversionTest.scala        | 16 ++---
 .../BenchmarkCardinalityEstimationTest.scala  |  6 +-
 .../logical/CardinalityCostModelTest.scala    | 14 ++---
 .../planner/logical/CardinalitySupport.scala  |  2 +-
 ...tesianProductPlanningIntegrationTest.scala | 10 +--
 .../CreateNodePlanningIntegrationTest.scala   | 10 +--
 ...eRelationshipPlanningIntegrationTest.scala | 12 ++--
 .../logical/DefaultQueryPlannerTest.scala     | 20 +++---
 .../ExpandPlanningIntegrationTest.scala       | 16 ++---
 ...ShortestPathsPlanningIntegrationTest.scala | 12 ++--
 .../logical/LeafPlanningIntegrationTest.scala | 28 ++++-----
 .../LogicalPlan2PlanDescriptionTest.scala     | 20 +++---
 ...LogicalPlanIdentificationBuilderTest.scala |  8 +--
 .../MergeNodePlanningIntegrationTest.scala    | 10 +--
 ...eRelationshipPlanningIntegrationTest.scala | 16 ++---
 .../v3_1}/planner/logical/MetricsTest.scala   |  4 +-
 ...athProjectionPlanningIntegrationTest.scala | 14 ++---
 .../NodeHashJoinPlanningIntegrationTest.scala | 12 ++--
 ...OptionalMatchPlanningIntegrationTest.scala | 14 ++---
 ...ernExpressionPatternElementNamerTest.scala |  8 +--
 ...ternPredicatePlanningIntegrationTest.scala | 14 ++---
 .../PickBestPlanUsingHintsAndCostTest.scala   | 12 ++--
 .../logical/PlanEventHorizonTest.scala        | 20 +++---
 ...PlanRewritingPlanningIntegrationTest.scala | 12 ++--
 .../logical/PriorityLeafPlannerListTest.scala |  8 +--
 .../QueryGraphConnectedComponentsTest.scala   | 12 ++--
 .../planner/logical/QueryGraphProducer.scala  | 14 ++---
 .../SingleRowPlanningIntegrationTest.scala    | 10 +--
 .../v3_1}/planner/logical/SolvablesTest.scala | 10 +--
 ...StatisticsBackedCardinalityModelTest.scala | 14 ++---
 .../UnionPlanningIntegrationTest.scala        | 10 +--
 .../logical/WithPlanningIntegrationTest.scala | 12 ++--
 .../logical/cardinality/CardinalityData.scala |  4 +-
 .../CardinalityModelTestHelper.scala          | 16 ++---
 .../cardinality/CardinalityTestHelper.scala   | 24 +++----
 .../ExpressionSelectivityCalculatorTest.scala | 20 +++---
 .../NodeCardinalityEstimatorTest.scala        | 14 ++---
 .../RandomizedCardinalityModelTestSuite.scala |  8 +--
 .../cardinality/SelectivityCombinerTest.scala |  6 +-
 ...ndenceQueryGraphCardinalityModelTest.scala | 10 +--
 .../PatternSelectivityCalculatorTest.scala    | 18 +++---
 ...impleTripletCardinalityEstimatorTest.scala | 20 +++---
 .../triplet/TripletConverterTest.scala        | 18 +++---
 ...ripletQueryGraphCardinalityModelTest.scala |  8 +--
 .../cardinality/triplet/TripletTest.scala     | 10 +--
 .../CartesianProductsOrValueJoinsTest.scala   | 12 ++--
 .../logical/idp/ExpandSolverStepTest.scala    | 18 +++---
 .../logical/idp/IDPQueryGraphSolverTest.scala | 16 ++---
 .../planner/logical/idp/IDPSolverTest.scala   | 14 ++---
 .../planner/logical/idp/IDPTableTest.scala    |  6 +-
 .../logical/idp/JoinSolverStepTest.scala      | 18 +++---
 .../patternExpressionRewriterTest.scala       | 14 ++---
 .../plans/AllNodesLeafPlannerTest.scala       | 10 +--
 .../plans/ArgumentLeafPlannerTest.scala       | 10 +--
 .../logical/plans/IdSeekLeafPlannerTest.scala | 16 ++---
 .../logical/plans/IndexLeafPlannerTest.scala  | 16 ++---
 .../plans/IndexScanLeafPlannerTest.scala      | 16 ++---
 .../plans/IndexSeekLeafPlannerTest.scala      | 16 ++---
 .../plans/InequalityRangeSeekableTest.scala   | 12 ++--
 .../plans/LabelScanLeafPlannerTest.scala      | 18 +++---
 .../logical/plans/LogicalPlanTest.scala       |  6 +-
 .../planner/logical/plans/SargableTest.scala  |  8 +--
 .../plans/rewriter/FuseSelectionsTest.scala   | 10 +--
 .../PredicateRemovalThroughJoinsTest.scala    | 12 ++--
 .../plans/rewriter/SimplifyEqualityTest.scala | 10 +--
 .../plans/rewriter/UnnestApplyTest.scala      | 12 ++--
 .../plans/rewriter/UnnestOptionalTest.scala   | 14 ++---
 .../plans/rewriter/cleanUpEagerTest.scala     | 14 ++---
 .../rewriter/removeIdenticalPlansTest.scala   |  8 +--
 .../logical/steps/AggregationTest.scala       | 10 +--
 .../logical/steps/ExtractBestPlanTest.scala   | 18 +++---
 .../steps/LegacyHintLeafPlannerTest.scala     | 14 ++---
 .../logical/steps/OuterHashJoinTest.scala     | 16 ++---
 .../steps/PatternExpressionSolverTest.scala   | 14 ++---
 .../logical/steps/ProjectionTest.scala        | 18 +++---
 .../logical/steps/SelectCoveredTest.scala     | 10 +--
 .../steps/SelectHasLabelWithJoinTest.scala    |  8 +--
 .../steps/SelectPatternPredicatesTest.scala   | 16 ++---
 .../logical/steps/SortSkipAndLimitTest.scala  | 16 ++---
 .../steps/TriadicSelectionFinderTest.scala    | 20 +++---
 .../logical/steps/countStorePlannerTest.scala | 18 +++---
 .../planner/logical/unnestEagerTest.scala     | 16 ++---
 .../prettifier/PrettifierParserTest.scala     |  4 +-
 .../v3_1}/prettifier/PrettifierTest.scala     |  4 +-
 .../v3_1}/profiler/ProfilerTest.scala         | 22 +++----
 .../compiler/v3_1}/spi/CSVResourcesTest.scala |  8 +--
 .../spi/GraphStatisticsSnapshotTest.scala     |  8 +--
 .../v3_1}/spi/QueryContextAdaptation.scala    |  8 +--
 .../spi/UpdateCountingQueryContextTest.scala  |  6 +-
 .../v3_1}/symbols/SymbolTableTest.scala       | 16 ++---
 .../CreateTempFileTestSupport.scala           |  4 +-
 .../v3_1}/test_helpers/CustomMatchers.scala   |  2 +-
 .../test_helpers/RandomizedTestSupport.scala  |  2 +-
 .../v3_1}/test_helpers/TestableIterator.scala |  2 +-
 .../test_helpers/WindowsStringSafe.scala      |  2 +-
 .../v3_1}/test_helpers/testRandomizer.scala   |  2 +-
 .../rewriters/RewriterStepSequencerTest.scala |  6 +-
 community/cypher/cypher/pom.xml               | 47 +++++++++++++-
 .../codegen/CompiledConversionUtils.java      |  4 +-
 .../internal/codegen/CompiledMathHelper.java  |  4 +-
 .../internal/tracing/CompilationTracer.java   |  2 +-
 .../tracing/TimingCompilationTracer.java      |  2 +-
 .../org/neo4j/cypher/CypherVersion.scala      |  5 +-
 .../internal/AmendedRootPlanDescription.scala |  2 +-
 .../cypher/internal/CypherCompiler.scala      |  4 +-
 .../cypher/internal/CypherPreParser.scala     |  4 +-
 .../internal/CypherStatementWithOptions.scala |  6 +-
 .../cypher/internal/ExecutionEngine.scala     |  6 +-
 .../neo4j/cypher/internal/ParsedQuery.scala   |  2 +-
 .../neo4j/cypher/internal/PlannerCache.scala  |  2 +-
 .../compatibility/CompatibilityFor2_3.scala   |  4 +-
 .../compatibility/CompatibilityFor3_0.scala   | 26 ++++----
 ...ceptionTranslatingQueryContextFor3_0.scala |  8 +--
 .../internal/helpers/wrappersFor2_3.scala     | 18 +++---
 .../spi/TransactionalContextWrapper.scala     |  2 +-
 .../spi/v2_3/HardcodedGraphStatistics.scala   |  2 +-
 .../v2_3/TransactionBoundTokenContext.scala   |  2 +-
 .../v3_0/BidirectionalTraversalMatcher.scala  |  8 +--
 .../ExceptionTranslatingPlanContext.scala     |  6 +-
 .../v3_0/ExceptionTranslationSupport.scala    |  2 +-
 .../spi/v3_0/GeneratedQueryStructure.scala    | 20 +++---
 .../spi/v3_0/HardcodedGraphStatistics.scala   |  2 +-
 .../MonodirectionalTraversalMatcher.scala     |  8 +--
 .../TransactionBoundGraphStatistics.scala     |  6 +-
 .../v3_0/TransactionBoundPlanContext.scala    | 10 +--
 .../v3_0/TransactionBoundQueryContext.scala   | 20 +++---
 .../v3_0/TransactionBoundTokenContext.scala   |  2 +-
 .../cypher/QueryExecutionMonitorTest.scala    | 63 ++++++++++++++++++-
 .../org/neo4j/cypher/QueryInvalidationIT.java |  4 +-
 .../CypherStatementWithOptionsTest.scala      |  2 +-
 ...ianProductNotificationAcceptanceTest.scala | 10 +--
 .../cypher/CypherCompatibilityTest.scala      | 12 +++-
 .../cypher/EagerizationAcceptanceTest.scala   |  6 +-
 .../org/neo4j/cypher/ErrorMessagesTest.scala  |  4 +-
 .../org/neo4j/cypher/ExecutionEngineIT.scala  | 54 +++++++++++++++-
 .../neo4j/cypher/ExecutionEngineTest.scala    |  4 +-
 .../cypher/ExecutionEngineTestSupport.scala   |  4 +-
 .../neo4j/cypher/ExplainAcceptanceTest.scala  |  4 +-
 .../cypher/GraphDatabaseTestSupport.scala     |  8 +--
 .../JoinHintPlanningIntegrationTest.scala     | 12 ++--
 .../org/neo4j/cypher/LdbcAcceptanceTest.scala |  4 +-
 .../cypher/MutatingIntegrationTest.scala      |  2 +-
 .../neo4j/cypher/NewPlannerTestSupport.scala  | 12 ++--
 .../NodeIndexSeekByRangeAcceptanceTest.scala  |  4 +-
 .../cypher/NotificationAcceptanceTest.scala   |  4 +-
 .../scala/org/neo4j/cypher/PatternGen.scala   |  4 +-
 .../neo4j/cypher/ProfilerAcceptanceTest.scala | 29 +++++----
 .../org/neo4j/cypher/QueryCachingTest.scala   |  8 +--
 .../cypher/QueryStatisticsTestSupport.scala   |  4 +-
 ...indableExecutionResultAcceptanceTest.scala |  2 +-
 .../neo4j/cypher/RootPlanAcceptanceTest.scala | 52 +++++++--------
 .../cypher/SemanticCreateAcceptanceTest.scala |  2 +-
 .../cypher/SemanticDeleteAcceptanceTest.scala |  2 +-
 .../cypher/SemanticErrorAcceptanceTest.scala  |  2 +-
 .../cypher/SemanticMergeAcceptanceTest.scala  |  2 +-
 .../cypher/SystemPropertyTestSupport.scala    |  2 +-
 .../SystemPropertyTestSupportTest.scala       |  2 +-
 .../scala/org/neo4j/cypher/TestSuites.scala   |  6 +-
 .../cypher/TxCountsTrackingTestSupport.scala  |  4 +-
 ...ueConstraintValidationAcceptanceTest.scala |  2 +-
 ...ConstraintVerificationAcceptanceTest.scala |  2 +-
 .../cypher/VarLengthAcceptanceTest.scala      |  8 +--
 .../LastCommittedTxIdProviderTest.scala       |  2 +-
 .../internal/RewindableExecutionResult.scala  | 16 ++---
 .../codegen/CompiledConversionUtilsTest.scala |  4 +-
 .../codegen/CompiledMathHelperTest.scala      |  2 +-
 .../CypherCompilerPerformanceTest.scala       |  4 +-
 .../compiler/CypherPreParserTest.scala        |  4 +-
 .../AllShortestPathsPipeTest.scala            | 12 ++--
 .../CompilerComparisonTest.scala              | 18 +++---
 .../{v3_0 => v3_1}/CreateNodeActionTest.scala |  6 +-
 .../CreateRelationshipTest.scala              |  6 +-
 ...CypherCompilerAstCacheAcceptanceTest.scala | 10 +--
 .../DoubleCheckCreateUniqueTest.scala         | 10 +--
 .../{v3_0 => v3_1}/LabelActionTest.scala      | 10 +--
 .../compiler/{v3_0 => v3_1}/LazyTest.scala    | 18 +++---
 .../MapPropertySetActionTest.scala            |  8 +--
 .../{v3_0 => v3_1}/MatchingContextTest.scala  | 20 +++---
 .../{v3_0 => v3_1}/MutationTest.scala         | 14 ++---
 .../{v3_0 => v3_1}/PathExpressionTest.scala   | 16 ++---
 .../{v3_0 => v3_1}/PatternMatchingTest.scala  | 20 +++---
 .../{v3_0 => v3_1}/PatternNodeTest.scala      |  6 +-
 .../{v3_0 => v3_1}/PipeLazynessTest.scala     | 18 +++---
 .../{v3_0 => v3_1}/QueryStateHelper.scala     |  6 +-
 .../QueryStateTestSupport.scala               |  4 +-
 .../RuleExecutablePlanBuilderTest.scala       | 36 +++++------
 .../ScalaPatternMatchingTest.scala            | 16 ++---
 .../SemanticIndexAcceptanceTest.scala         |  2 +-
 .../SimplePatternMatchingTest.scala           | 14 ++---
 .../SingleShortestPathPipeTest.scala          | 10 +--
 .../{v3_0 => v3_1}/TrailDecomposeTest.scala   | 10 +--
 .../TraversalMatcherBuilderTest.scala         | 20 +++---
 .../{v3_0 => v3_1}/TraversalMatcherTest.scala | 12 ++--
 .../TriadicIntegrationTest.scala              |  4 +-
 ...VariableLengthExpanderStepExpandTest.scala |  8 +--
 .../codegen/CodeGeneratorTest.scala           | 22 +++----
 .../ir/BuildProbeTableInstructionsTest.scala  | 10 +--
 .../ir/CodeGenExpressionCompilationTest.scala | 14 ++---
 .../codegen/ir/CodeGenSugar.scala             | 18 +++---
 .../codegen/ir/CompiledProfilingTest.scala    | 28 ++++-----
 .../commands/expressions/LiteralMapTest.scala |  6 +-
 .../pipes/ActualCostCalculationTest.scala     | 10 +--
 .../{v3_0 => v3_1}/pipes/MatchPipeTest.scala  | 10 +--
 .../pipes/NamedPathPipeTest.scala             |  8 +--
 .../internal/helpers/CastSupportTest.scala    |  6 +-
 .../helpers/JavaConversionSupportTest.scala   |  4 +-
 .../TransactionBoundQueryContextTest.scala    |  6 +-
 .../tracing/TimingCompilationTracerTest.scala |  6 +-
 .../cypher/performance/DataImportTest.scala   |  2 +-
 .../cypher/performance/PerformanceTest.scala  |  2 +-
 .../LICENSES.txt                              |  0
 .../{frontend-3.0 => frontend-3.1}/NOTICE.txt |  0
 .../{frontend-3.0 => frontend-3.1}/pom.xml    |  4 +-
 .../internal/frontend/v3_1}/Bound.scala       |  2 +-
 .../frontend/v3_1}/CypherException.scala      |  6 +-
 .../internal/frontend/v3_1}/Foldable.scala    |  2 +-
 .../internal/frontend/v3_1}/IdentityMap.scala |  2 +-
 .../frontend/v3_1}/InputPosition.scala        |  2 +-
 .../internal/frontend/v3_1}/NameId.scala      |  2 +-
 .../cypher/internal/frontend/v3_1}/Ref.scala  |  2 +-
 .../internal/frontend/v3_1}/Rewritable.scala  |  6 +-
 .../frontend/v3_1}/SemanticCheck.scala        |  4 +-
 .../frontend/v3_1}/SemanticDirection.scala    |  2 +-
 .../frontend/v3_1}/SemanticError.scala        |  2 +-
 .../frontend/v3_1}/SemanticState.scala        | 12 ++--
 .../frontend/v3_1}/SemanticTable.scala        |  6 +-
 .../frontend/v3_1}/ast/ASTAnnotationMap.scala |  6 +-
 .../internal/frontend/v3_1}/ast/ASTNode.scala |  8 +--
 .../v3_1}/ast/AndedPropertyInequalities.scala |  8 +--
 .../v3_1}/ast/ArithmeticFunctions.scala       |  6 +-
 .../frontend/v3_1}/ast/CaseExpression.scala   |  8 +--
 .../internal/frontend/v3_1}/ast/Clause.scala  | 16 ++---
 .../frontend/v3_1}/ast/CoerceTo.scala         |  8 +--
 .../frontend/v3_1}/ast/Collection.scala       |  8 +--
 .../internal/frontend/v3_1}/ast/Command.scala |  6 +-
 .../v3_1}/ast/ConstantExpression.scala        |  2 +-
 .../frontend/v3_1}/ast/CountStar.scala        |  6 +-
 .../frontend/v3_1}/ast/Expression.scala       | 12 ++--
 .../frontend/v3_1}/ast/Function.scala         |  6 +-
 .../v3_1}/ast/FunctionInvocation.scala        |  6 +-
 .../frontend/v3_1}/ast/GetDegree.scala        |  8 +--
 .../frontend/v3_1}/ast/HasLabels.scala        |  8 +--
 .../internal/frontend/v3_1}/ast/Hint.scala    |  8 +--
 .../frontend/v3_1}/ast/IsAggregate.scala      |  2 +-
 .../v3_1}/ast/IterableExpressions.scala       |  8 +--
 .../internal/frontend/v3_1}/ast/Limit.scala   |  4 +-
 .../internal/frontend/v3_1}/ast/Literal.scala | 10 +--
 .../frontend/v3_1}/ast/MapExpression.scala    |  8 +--
 .../frontend/v3_1}/ast/MergeAction.scala      |  4 +-
 .../frontend/v3_1}/ast/NameToken.scala        |  4 +-
 .../v3_1}/ast/OperatorExpression.scala        |  2 +-
 .../internal/frontend/v3_1}/ast/Order.scala   |  4 +-
 .../frontend/v3_1}/ast/Parameter.scala        |  6 +-
 .../frontend/v3_1}/ast/PathExpression.scala   |  6 +-
 .../internal/frontend/v3_1}/ast/Pattern.scala | 10 +--
 .../v3_1}/ast/PatternExpression.scala         |  6 +-
 .../v3_1}/ast/PeriodicCommitHint.scala        |  4 +-
 .../v3_1}/ast/PredicateExpressions.scala      |  8 +--
 .../v3_1}/ast/ProcedureResultItem.scala       |  8 +--
 .../frontend/v3_1}/ast/Property.scala         |  8 +--
 .../internal/frontend/v3_1}/ast/Query.scala   |  4 +-
 .../internal/frontend/v3_1}/ast/Range.scala   |  4 +-
 .../frontend/v3_1}/ast/RemoveItem.scala       |  6 +-
 .../frontend/v3_1}/ast/ReturnItem.scala       |  4 +-
 .../frontend/v3_1}/ast/ScopeExpression.scala  |  6 +-
 .../internal/frontend/v3_1}/ast/SetItem.scala |  6 +-
 .../v3_1}/ast/ShortestPathExpression.scala    |  4 +-
 .../internal/frontend/v3_1}/ast/Skip.scala    |  4 +-
 .../frontend/v3_1}/ast/Statement.scala        |  4 +-
 .../frontend/v3_1}/ast/SymbolicName.scala     |  4 +-
 .../frontend/v3_1}/ast/Variable.scala         |  8 +--
 .../internal/frontend/v3_1}/ast/Where.scala   |  6 +-
 .../v3_1}/ast/connectedComponents.scala       |  2 +-
 .../v3_1}/ast/containsAggregate.scala         |  2 +-
 .../frontend/v3_1}/ast/functions/Abs.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Acos.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Asin.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Atan.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Atan2.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Avg.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Ceil.scala   |  6 +-
 .../v3_1}/ast/functions/Coalesce.scala        |  8 +--
 .../v3_1}/ast/functions/Collect.scala         |  8 +--
 .../frontend/v3_1}/ast/functions/Cos.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Cot.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Count.scala  |  6 +-
 .../v3_1}/ast/functions/Degrees.scala         |  6 +-
 .../v3_1}/ast/functions/Distance.scala        |  6 +-
 .../frontend/v3_1}/ast/functions/E.scala      |  6 +-
 .../v3_1}/ast/functions/EndNode.scala         |  6 +-
 .../frontend/v3_1}/ast/functions/Exists.scala |  8 +--
 .../frontend/v3_1}/ast/functions/Exp.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Floor.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Has.scala    |  8 +--
 .../v3_1}/ast/functions/Haversin.scala        |  6 +-
 .../frontend/v3_1}/ast/functions/Head.scala   |  8 +--
 .../frontend/v3_1}/ast/functions/Id.scala     |  6 +-
 .../frontend/v3_1}/ast/functions/Keys.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/LTrim.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Labels.scala |  6 +-
 .../frontend/v3_1}/ast/functions/Last.scala   |  8 +--
 .../frontend/v3_1}/ast/functions/Left.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Length.scala | 12 ++--
 .../frontend/v3_1}/ast/functions/Log.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Log10.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Lower.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Max.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Min.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Nodes.scala  |  6 +-
 .../v3_1}/ast/functions/PercentileCont.scala  |  8 +--
 .../v3_1}/ast/functions/PercentileDisc.scala  | 10 +--
 .../frontend/v3_1}/ast/functions/Pi.scala     |  6 +-
 .../frontend/v3_1}/ast/functions/Point.scala  |  6 +-
 .../v3_1}/ast/functions/Properties.scala      |  6 +-
 .../frontend/v3_1}/ast/functions/RTrim.scala  |  6 +-
 .../v3_1}/ast/functions/Radians.scala         |  6 +-
 .../frontend/v3_1}/ast/functions/Rand.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Range.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Reduce.scala |  6 +-
 .../v3_1}/ast/functions/Relationships.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Rels.scala   |  6 +-
 .../v3_1}/ast/functions/Replace.scala         |  6 +-
 .../v3_1}/ast/functions/Reverse.scala         |  6 +-
 .../frontend/v3_1}/ast/functions/Right.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Round.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Sign.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Sin.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Size.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Split.scala  |  6 +-
 .../frontend/v3_1}/ast/functions/Sqrt.scala   |  6 +-
 .../v3_1}/ast/functions/StartNode.scala       |  6 +-
 .../frontend/v3_1}/ast/functions/StdDev.scala |  6 +-
 .../v3_1}/ast/functions/StdDevP.scala         |  6 +-
 .../v3_1}/ast/functions/Substring.scala       |  6 +-
 .../frontend/v3_1}/ast/functions/Sum.scala    |  6 +-
 .../frontend/v3_1}/ast/functions/Tail.scala   |  8 +--
 .../frontend/v3_1}/ast/functions/Tan.scala    |  6 +-
 .../v3_1}/ast/functions/Timestamp.scala       |  6 +-
 .../v3_1}/ast/functions/ToFloat.scala         |  6 +-
 .../frontend/v3_1}/ast/functions/ToInt.scala  |  6 +-
 .../v3_1}/ast/functions/ToLower.scala         |  6 +-
 .../v3_1}/ast/functions/ToString.scala        |  6 +-
 .../v3_1}/ast/functions/ToUpper.scala         |  6 +-
 .../frontend/v3_1}/ast/functions/Trim.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Type.scala   |  6 +-
 .../frontend/v3_1}/ast/functions/Upper.scala  |  6 +-
 .../ast/hasAggregateButIsNotAggregate.scala   |  2 +-
 .../frontend/v3_1}/helpers/Eagerly.scala      |  2 +-
 .../frontend/v3_1}/helpers/NonEmptyList.scala |  4 +-
 .../frontend/v3_1}/helpers/StringHelper.scala |  2 +-
 .../frontend/v3_1}/helpers/TreeZipper.scala   |  2 +-
 .../frontend/v3_1}/helpers/fixedPoint.scala   |  2 +-
 .../notification/InternalNotification.scala   |  4 +-
 .../internal/frontend/v3_1}/package.scala     |  6 +-
 .../internal/frontend/v3_1}/parser/Base.scala |  4 +-
 .../v3_1}/parser/BufferPosition.scala         |  4 +-
 .../frontend/v3_1}/parser/Clauses.scala       |  4 +-
 .../frontend/v3_1}/parser/Command.scala       |  6 +-
 .../frontend/v3_1}/parser/CypherParser.scala  |  4 +-
 .../frontend/v3_1}/parser/Expressions.scala   |  4 +-
 .../parser/InvalidInputErrorFormatter.scala   |  2 +-
 .../v3_1}/parser/LikePatternParser.scala      |  2 +-
 .../frontend/v3_1}/parser/Literals.scala      |  6 +-
 .../frontend/v3_1}/parser/Patterns.scala      |  4 +-
 .../v3_1}/parser/ProcedureCalls.scala         |  6 +-
 .../frontend/v3_1}/parser/Query.scala         |  4 +-
 .../frontend/v3_1}/parser/StartPoints.scala   |  4 +-
 .../frontend/v3_1}/parser/Statement.scala     |  4 +-
 .../frontend/v3_1}/parser/Strings.scala       |  2 +-
 .../parser/convertLikePatternToRegex.scala    |  2 +-
 .../matchers/IdentifierPartMatcher.scala      |  2 +-
 .../matchers/IdentifierStartMatcher.scala     |  2 +-
 .../parser/matchers/ScalaCharMatcher.scala    |  2 +-
 .../matchers/WhitespaceCharMatcher.scala      |  2 +-
 .../frontend/v3_1}/parser/package.scala       |  4 +-
 .../v3_1}/spi/MapToPublicExceptions.scala     |  4 +-
 .../frontend/v3_1}/symbols/AnyType.scala      |  2 +-
 .../frontend/v3_1}/symbols/BooleanType.scala  |  2 +-
 .../frontend/v3_1}/symbols/CypherType.scala   |  2 +-
 .../frontend/v3_1}/symbols/FloatType.scala    |  2 +-
 .../frontend/v3_1}/symbols/IntegerType.scala  |  2 +-
 .../frontend/v3_1}/symbols/ListType.scala     |  2 +-
 .../frontend/v3_1}/symbols/MapType.scala      |  2 +-
 .../frontend/v3_1}/symbols/NodeType.scala     |  2 +-
 .../frontend/v3_1}/symbols/NumberType.scala   |  2 +-
 .../frontend/v3_1}/symbols/PathType.scala     |  2 +-
 .../frontend/v3_1}/symbols/PointType.scala    |  2 +-
 .../v3_1}/symbols/RelationshipType.scala      |  2 +-
 .../frontend/v3_1}/symbols/StringType.scala   |  2 +-
 .../frontend/v3_1}/symbols/TypeRange.scala    |  2 +-
 .../frontend/v3_1}/symbols/TypeSpec.scala     |  2 +-
 .../frontend/v3_1}/symbols/package.scala      |  2 +-
 .../frontend/v3_1}/symbols/type_system.txt    |  0
 .../frontend/v3_1}/DummyPosition.scala        |  2 +-
 .../frontend/v3_1}/FoldableTest.scala         |  4 +-
 .../internal/frontend/v3_1}/RepeatTest.scala  |  6 +-
 .../frontend/v3_1}/RewritableTest.scala       |  4 +-
 .../frontend/v3_1}/ast/ASTNodeTest.scala      |  6 +-
 .../internal/frontend/v3_1}/ast/AddTest.scala |  6 +-
 .../internal/frontend/v3_1}/ast/AndTest.scala |  6 +-
 .../ast/AstConstructionTestSupport.scala      |  6 +-
 .../v3_1}/ast/CaseExpressionTest.scala        |  8 +--
 .../v3_1}/ast/CollectionSliceTest.scala       |  8 +--
 .../v3_1}/ast/ConnectedComponentsTest.scala   |  4 +-
 .../v3_1}/ast/ConstantExpressionTest.scala    |  6 +-
 .../v3_1}/ast/ContainerIndexTest.scala        |  8 +--
 .../v3_1}/ast/ContainsAggregateTest.scala     |  4 +-
 .../v3_1}/ast/DecimalDoubleLiteralTest.scala  |  8 +--
 .../frontend/v3_1}/ast/DivideTest.scala       |  6 +-
 .../frontend/v3_1}/ast/DummyExpression.scala  |  6 +-
 .../frontend/v3_1}/ast/ExpressionTest.scala   |  8 +--
 .../v3_1}/ast/ExtractExpressionTest.scala     |  8 +--
 .../v3_1}/ast/FilterExpressionTest.scala      |  8 +--
 .../ast/FindDuplicateRelationshipsTest.scala  |  6 +-
 .../frontend/v3_1}/ast/FunctionNameTest.scala |  4 +-
 .../v3_1}/ast/GreaterThanOrEqualTest.scala    |  6 +-
 .../frontend/v3_1}/ast/GreaterThanTest.scala  |  6 +-
 .../v3_1}/ast/HexIntegerLiteralTest.scala     |  8 +--
 .../v3_1}/ast/InfixExpressionTestBase.scala   | 10 +--
 .../frontend/v3_1}/ast/IsAggregateTest.scala  |  4 +-
 .../v3_1}/ast/LessThanOrEqualTest.scala       |  6 +-
 .../frontend/v3_1}/ast/LessThanTest.scala     |  6 +-
 .../v3_1}/ast/ListComprehensionTest.scala     | 10 +--
 .../frontend/v3_1}/ast/LoadCSVTest.scala      |  8 +--
 .../frontend/v3_1}/ast/ModuloTest.scala       |  6 +-
 .../frontend/v3_1}/ast/MultiplyTest.scala     |  6 +-
 .../v3_1}/ast/OctalIntegerLiteralTest.scala   |  8 +--
 .../internal/frontend/v3_1}/ast/OrTest.scala  |  6 +-
 .../v3_1}/ast/PeriodicCommitHintTest.scala    |  6 +-
 .../internal/frontend/v3_1}/ast/PowTest.scala |  6 +-
 .../v3_1}/ast/ProjectionClauseTest.scala      |  8 +--
 .../v3_1}/ast/ReduceExpressionTest.scala      | 10 +--
 .../frontend/v3_1}/ast/ReturnItemsTest.scala  |  6 +-
 .../frontend/v3_1}/ast/SetClauseTest.scala    |  8 +--
 .../ast/SignedDecimalIntegerLiteralTest.scala |  8 +--
 .../ast/StatementReturnColumnsTest.scala      |  6 +-
 .../v3_1}/ast/StringLiteralTest.scala         |  8 +--
 .../frontend/v3_1}/ast/SubtractTest.scala     |  6 +-
 .../UnsignedDecimalIntegerLiteralTest.scala   |  8 +--
 .../frontend/v3_1}/ast/VariableTest.scala     |  8 +--
 .../internal/frontend/v3_1}/ast/XorTest.scala |  6 +-
 .../v3_1}/ast/functions/AbsTest.scala         |  4 +-
 .../v3_1}/ast/functions/DistanceTest.scala    |  4 +-
 .../ast/functions/FunctionTestBase.scala      | 12 ++--
 .../v3_1}/ast/functions/LabelsTest.scala      |  4 +-
 .../ast/functions/PercentileContTest.scala    |  6 +-
 .../ast/functions/PercentileDiscTest.scala    |  6 +-
 .../v3_1}/ast/functions/PointTest.scala       |  4 +-
 .../v3_1}/ast/functions/SplitTest.scala       |  4 +-
 .../v3_1}/ast/functions/ToFloatTest.scala     |  4 +-
 .../v3_1}/ast/functions/ToIntTest.scala       |  4 +-
 .../v3_1}/ast/functions/ToStringTest.scala    |  4 +-
 .../v3_1}/helpers/NonEmptyListTest.scala      |  4 +-
 .../v3_1}/helpers/StringHelperTest.scala      |  4 +-
 .../frontend/v3_1}/parser/BaseRulesTest.scala |  2 +-
 .../v3_1}/parser/ComparisonTest.scala         |  4 +-
 .../frontend/v3_1}/parser/LiteralsTest.scala  |  4 +-
 .../frontend/v3_1}/parser/ParserAstTest.scala |  6 +-
 .../frontend/v3_1}/parser/ParserTest.scala    |  6 +-
 .../parser/ProcedureCallParserTest.scala      |  6 +-
 .../v3_1}/symbols/CypherTypeTest.scala        |  4 +-
 .../v3_1}/symbols/TypeRangeTest.scala         |  4 +-
 .../frontend/v3_1}/symbols/TypeSpecTest.scala |  4 +-
 .../v3_1}/test_helpers/CypherFunSuite.scala   |  2 +-
 .../test_helpers/CypherTestSupport.scala      |  2 +-
 .../v3_1}/test_helpers/IgnoreAllTests.scala   |  2 +-
 community/cypher/pom.xml                      |  5 +-
 .../rest/AbstractRestFunctionalTestBase.java  |  2 +-
 enterprise/kernel/pom.xml                     |  6 +-
 .../EnterpriseGraphDatabaseTestSupport.scala  |  2 +-
 ...rtyExistenceConstraintAcceptanceTest.scala |  2 +-
 .../org/neo4j/cypher/docgen/ArticleTest.scala |  4 +-
 .../docgen/CollectionsAndMapsTest.scala       |  2 +-
 .../cypher/docgen/DocumentingTestBase.scala   |  6 +-
 .../neo4j/cypher/docgen/FunctionsTest.scala   |  2 +-
 .../org/neo4j/cypher/docgen/PatternTest.scala |  2 +-
 .../neo4j/cypher/docgen/QueryPlanTest.scala   |  2 +-
 .../neo4j/cypher/docgen/SchemaIndexTest.scala |  8 +--
 .../org/neo4j/cypher/docgen/SyntaxTest.scala  |  2 +-
 .../cypher/docgen/tooling/Document.scala      |  6 +-
 .../docgen/tooling/DocumentingTest.scala      |  4 +-
 .../tooling/QueryResultContentBuilder.scala   |  4 +-
 .../cypher/docgen/tooling/QueryRunner.scala   |  4 +-
 .../docgen/tooling/RestartableDatabase.scala  |  2 +-
 .../tooling/captureStateAsGraphViz.scala      |  2 +-
 .../tooling/contentAndResultMerger.scala      |  4 +-
 .../tests/ContentAndResultMergerTest.scala    |  2 +-
 .../docgen/tooling/tests/DocumentTest.scala   |  2 +-
 .../tests/QueryResultContentBuilderTest.scala |  2 +-
 .../tooling/tests/QueryRunnerTest.scala       |  4 +-
 .../tests/RestartableDatabaseTest.scala       |  2 +-
 .../tooling/tests/RunnableContentTest.scala   |  2 +-
 .../java/org/neo4j/doc/cypherdoc/State.java   |  2 +-
 .../cypher/internal/DocsExecutionEngine.scala |  2 +-
 .../internal/DocsExecutionEngineTest.java     |  2 +-
 .../org/neo4j/cypher/docgen/RefcardTest.scala |  4 +-
 .../docgen/refcard/AggregationTest.scala      |  2 +-
 .../cypher/docgen/refcard/CallTest.scala      |  2 +-
 .../cypher/docgen/refcard/CaseTest.scala      |  2 +-
 .../refcard/CollectionExpressionsTest.scala   |  2 +-
 .../refcard/CollectionPredicatesTest.scala    |  2 +-
 .../docgen/refcard/CollectionsTest.scala      |  2 +-
 .../docgen/refcard/ConstraintTest.scala       |  2 +-
 .../cypher/docgen/refcard/CreateTest.scala    |  2 +-
 .../docgen/refcard/CreateUniqueTest.scala     |  2 +-
 .../cypher/docgen/refcard/DeleteTest.scala    |  2 +-
 .../cypher/docgen/refcard/ExampleTest.scala   |  2 +-
 .../cypher/docgen/refcard/ForeachTest.scala   |  2 +-
 .../cypher/docgen/refcard/FunctionsTest.scala |  2 +-
 .../cypher/docgen/refcard/ImportTest.scala    |  2 +-
 .../cypher/docgen/refcard/IndexTest.scala     |  2 +-
 .../cypher/docgen/refcard/LabelsTest.scala    |  2 +-
 .../cypher/docgen/refcard/MapsTest.scala      |  2 +-
 .../cypher/docgen/refcard/MatchTest.scala     |  2 +-
 .../refcard/MathematicalFunctionsTest.scala   |  2 +-
 .../cypher/docgen/refcard/MergeTest.scala     |  2 +-
 .../docgen/refcard/PathFunctionsTest.scala    |  2 +-
 .../cypher/docgen/refcard/PatternsTest.scala  |  2 +-
 .../docgen/refcard/PredicatesTest.scala       |  2 +-
 .../refcard/RelationshipFunctionsTest.scala   |  2 +-
 .../cypher/docgen/refcard/RemoveTest.scala    |  2 +-
 .../cypher/docgen/refcard/ReturnTest.scala    |  2 +-
 .../neo4j/cypher/docgen/refcard/SetTest.scala |  2 +-
 .../cypher/docgen/refcard/StartTest.scala     |  2 +-
 .../docgen/refcard/StringFunctionsTest.scala  |  2 +-
 .../cypher/docgen/refcard/UnionTest.scala     |  2 +-
 .../cypher/docgen/refcard/WhereTest.scala     |  2 +-
 .../cypher/docgen/refcard/WithTest.scala      |  2 +-
 .../examples/AbstractJavaDocTestBase.java     |  2 +-
 1513 files changed, 6595 insertions(+), 6425 deletions(-)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/.gitignore (100%)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/LICENSE.txt (100%)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/LICENSES.txt (100%)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/NOTICE.txt (100%)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/README.txt (100%)
 rename community/cypher/{cypher-compiler-3.0 => cypher-compiler-3.1}/pom.xml (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/CompilationPhaseTracer.java (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/codegen/QueryExecutionTracer.java (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ResultRowImpl.java (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/codegen/profiling/ProfilingTracer.java (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/GeneratedQuery.java (75%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/GeneratedQueryExecution.java (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/spi/InternalResultRow.java (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1}/spi/InternalResultVisitor.java (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ASTRewriter.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/AbstractPattern.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/BoundOrdering.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/CacheAccessor.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/Comparer.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/CypherCompiler.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/CypherOrdering.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/CypherSerializer.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ExecutionContext.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ExecutionMode.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ExecutionResultDumper.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ExplainExecutionResult.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/HardcodedGraphStatistics.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/HasOptionalDefault.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/IdentitySet.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/InternalNotificationLogger.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/InternalQueryStatistics.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/LRUCache.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/LabelSpec.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/Maybe.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/Monitors.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/OnAction.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/PipeExecutionResult.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/PlannerName.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/PreparedQuery.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ResultIterator.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/RuntimeBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/RuntimeName.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ScopeTreeVerifier.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/SeekRange.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/SemanticChecker.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/SyntaxExceptionCreator.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/TaskCloser.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/UpdateStrategy.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/NestedPipeExpression.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/QueryTagger.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/ResolvedCall.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/SeekRangeWrapper.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/aggregationsAreIsolated.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/collectNodesOfType.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/containsNamedPathOnlyForShortestPath.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/containsNoMatchingNodes.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/containsNoNodesOfType.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/containsNoReturnAll.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/noDuplicatesInReturnItems.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/noReferenceEqualityAmongVariables.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/noUnnamedPatternElementsInMatch.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/normalizedEqualsArguments.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/orderByOnlyOnVariables.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/commands/ExpressionConverters.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/commands/OtherConverters.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/commands/PatternConverters.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/commands/StatementConverters.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/ClauseConverters.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/ExpressionConverters.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/PatternConverters.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/PlannerQueryBuilder.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/StatementConverters.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/groupInequalityPredicates.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/package.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/CNFNormalizer.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/InliningContext.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/MatchPredicateNormalization.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/MatchPredicateNormalizer.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/Namespacer.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/PredicateSplitter.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/addUniquenessPredicates.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/collapseInCollections.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/copyVariables.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/expandStar.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/foldConstants.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/inlineProjections.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/inliningContextCreator.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/isolateAggregation.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/literalReplacement.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/nameMatchPatternElements.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/namePatternElements.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeArgumentOrder.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeComparisons.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeMatchPredicates.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeNotEquals.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeReturnClauses.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeSargablePredicates.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/normalizeWithClauses.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/projectFreshSortExpressions.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/projectNamedPaths.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/reattachAliasedExpressions.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/rewriteEqualityToInCollection.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/CodeGenContext.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/CodeGenPlan.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/CodeGenerator.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/CodeStructure.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/LogicalPlanConverter.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/Namer.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/QueryExecutionEvent.java (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/AcceptVisitor.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/BuildProbeTable.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/CartesianProductInstruction.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/CheckingInstruction.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/DecreaseAndReturnWhenZero.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/ExpandAllLoopDataGenerator.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/ExpandIntoLoopDataGenerator.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/ForEachExpression.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/GetMatchesFromProbeTable.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/If.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/IndexSeek.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/IndexUniqueSeek.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/Instruction.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/LoopDataGenerator.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/MethodInvocation.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/NullingInstruction.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/Projection.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/ScanAllNodes.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/ScanForLabel.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/SelectionInstruction.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/WhileLoop.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Addition.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/BinaryOperator.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/CastToCollection.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/CodeGenExpression.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Collection.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Division.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Equals.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/ExpressionConverter.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/HasLabel.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Literal.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/LoadVariable.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Modulo.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Multiplication.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/MyMap.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/NodeExpression.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/NodeProjection.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/NodeProperty.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Not.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Or.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Parameter.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/RelationshipExpression.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/RelationshipProjection.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/Subtraction.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/ToSet.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/TypeOf.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/functions/CodeGenFunction1.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/functions/functionConverter.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/setStaticField.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/AstNode.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/CreateUniqueAst.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/EntityProducerFactory.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/InCollection.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/IndexOperation.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/LabelAction.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/MergeAst.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/NamedPath.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/PathExpression.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/PathExtractor.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/Pattern.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/Query.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/QueryBuilder.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/QueryString.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/ReturnItem.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/SortItem.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/StartItem.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/Union.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/coerce.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Add.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/AggregationExpression.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Avg.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Closure.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CoalesceFunction.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CoerceTo.scala (77%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Collect.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Collection.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CollectionSliceExpression.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ContainerIndex.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Count.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CountStar.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/DistanceFunction.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Distinct.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Divide.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Expression.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ExtractFunction.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/FilterFunction.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/GenericCase.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/GetDegree.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/IdFunction.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/InequalitySeekRangeExpression.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/KeysFunction.scala (77%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/LabelsFunction.scala (76%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/LengthFunction.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Literal.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/LiteralMap.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/MathFunction.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Max.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Min.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Modulo.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Multiply.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/NestedPipeExpression.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/NodesFunction.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Null.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/NullInNullOutExpression.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ParameterExpression.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PathImpl.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PathValueBuilder.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Percentile.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PointFunction.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Pow.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PrefixSeekRangeExpression.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ProjectedPath.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PropertiesFunction.scala (77%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Property.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ReduceFunction.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/RelationshipEndPoints.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/RelationshipFunction.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/RelationshipTypeFunction.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ShortestPathExpression.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ShortestPathSPI.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/SimpleCase.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/SizeFunction.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Stdev.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/StringFunctions.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Subtract.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Sum.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/TimestampFunction.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToFloatFunction.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToIntFunction.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToStringFunction.scala (76%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/Variable.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/indexQuery.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/predicates/Ands.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/predicates/ComparablePredicate.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/predicates/Ors.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/predicates/Predicate.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/predicates/groupInequalityPredicatesForLegacy.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/values/KeyToken.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/values/TokenType.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/CompiledExecutionResult.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/DefaultExecutionResultBuilderFactory.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/Effects.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/EntityAccessor.java (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ErrorReportingExecutablePlanBuilder.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ExecutionPlan.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ExecutionPlanBuilder.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ExecutionResultBuilder.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/InternalExecutionResult.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/InternalQueryType.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/LegacyExecutablePlanBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/LoadCsvIterator.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/LoadCsvPeriodicCommitObserver.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/MatchPattern.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/Namer.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/PartiallySolvedQuery.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/Phase.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/PlanBuilder.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/PlanFingerprint.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ProcedureCallMode.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/Provider.java (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/SilentFallbackPlanBuilder.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/StandardInternalExecutionResult.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/UpdateCounter.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/addEagernessIfNecessary.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/AggregationBuilder.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ColumnFilterBuilder.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/DistinctBuilder.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/EmptyResultBuilder.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ExtractBuilder.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/FilterBuilder.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/GetGraphElements.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/IfElseIterator.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/IndexLookupBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/LoadCSVBuilder.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MatchBuilder.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MergeIntoBuilder.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MergePatternBuilder.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MergeStartPointBuilder.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/NamedPathBuilder.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/NodeFetchStrategy.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/OptionalMatchBuilder.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/PatternGraphBuilder.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/PredicateRewriter.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/QueryStateSettingIterator.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/QueryToken.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/RelationshipByIdBuilder.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ShortestPathBuilder.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/SliceBuilder.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/SortBuilder.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/StartPointBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/StartPointChoosingBuilder.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TopPipeBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TrailBuilder.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TraversalMatcherBuilder.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UnionBuilder.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UnwindBuilder.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UpdateActionBuilder.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UpdateCommandExpander.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/prepare/KeyTokenResolver.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/checkForEagerLoadCsv.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/formatOutput.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/ProcedureCallExecutionPlan.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/ProcedureExecutionResult.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/PureSideEffectExecutionPlan.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/PureSideEffectInternalExecutionResult.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/verifiers/Verifier.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ArrayBackedMap.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/CachedFunction.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/CastSupport.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/CollectionSupport.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/Counter.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/DynamicIterable.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/IteratorSupport.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/JavaConversionSupport.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/LabelSupport.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/LazyIterable.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/LiteralTypeSupport.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/MapSupport.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/Materialized.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/PartialFunctionSupport.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/PrefixNameGenerator.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/PropertySupport.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/RuntimeJavaValueConverter.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/RuntimeScalaValueConverter.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/RuntimeTextValueConverter.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ScalaCompatibility.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/StringRenderingSupport.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/Tapper.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/TypeSafeMathSupport.scala (99%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ZeroOneOrMany.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/package.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/simpleExpressionEvaluator.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/CreateNode.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/CreateRelationship.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/CreateUniqueAction.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/DeleteEntityAction.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/DeletePropertyAction.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/ForeachAction.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/GraphElementPropertyFunctions.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/MapPropertySetAction.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/MergeNodeAction.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/MergePatternAction.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/NamedExpectation.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/PropertySetAction.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/SetAction.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/UniqueLink.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/UpdateAction.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/makeValueNeoSafe.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/AllNodesScanPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ApplyPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ArgumentPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/AssertSameNodePipe.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/CachingExpandInto.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/CartesianProductPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ColumnFilterPipe.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ConditionalApplyPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ConstraintOperationPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/CreateNodePipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/CreateRelationshipPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/DeletePipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/DirectedRelationshipByIdSeekPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/DistinctPipe.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EagerAggregationPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EagerPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EmptyResultPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EntityProducer.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ErrorPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExecuteUpdateCommandsPipe.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExpandAllPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExpandIntoPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExternalCSVResource.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExtractPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/FilterPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ForeachPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/IdSeekIterator.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/IndexOperationPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/IndexSeekMode.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyLabel.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyPropertyKey.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyType.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyTypes.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LegacySortPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LetSelectOrSemiApplyPipe.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LetSemiApplyPipe.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LimitPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LoadCSVPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/MatchPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/MergeIntoPipe.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/MutableMaps.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NamedPathPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NiceHasher.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeByIdSeekPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeByLabelEntityProducer.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeByLabelScanPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeCountFromCountStorePipe.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeHashJoinPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeIndexContainsScanPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeIndexScanPipe.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeIndexSeekPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeOuterHashJoinPipe.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalExpandAllPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalExpandIntoPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalMatchPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/Pipe.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/PipeDecorator.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProcedureCallPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProduceResultsPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProjectEndpointsPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProjectionPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/QueryState.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RelationshipCountFromCountStorePipe.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RemoveLabelsPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RepeatableReadPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RollUpApplyPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RonjaPipe.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SelectOrSemiApplyPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SemiApplyPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SetOperation.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SetPipe.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ShortestPathPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SkipPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SlicePipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SortPipe.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/StartPipe.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/TopPipe.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/TraversalMatchPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/TriadicSelectionPipe.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UndirectedRelationshipByIdSeekPipe.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnionIterator.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnionPipe.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnwindPipe.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ValueHashJoinPipe.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/VarLengthExpandPipe.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/AggregationFunction.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/AvgFunction.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/CollectFunction.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/CountFunction.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/CountStarFunction.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/DistinctFunction.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/MaxFunction.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/NumericExpressionOnly.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/PercentileFunction.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/StdevFunction.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/SumFunction.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/EndPoint.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/ExpanderStep.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/GraphRelationship.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/History.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/MatchingContext.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/MatchingPair.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternElement.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternGraph.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternMatcher.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternMatchingBuilder.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternNode.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternRelationship.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/SimplePatternMatcherBuilder.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/SingleStep.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/SingleStepTrail.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/Trail.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/TraversalMatcher.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/TraversalPathExpander.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/VarLengthStep.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/VariableLengthStepTrail.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/InternalPlanDescription.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/PlanDescriptionArgumentSerializer.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/renderAsTreeTable.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/renderSummary.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CantCompileQueryException.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CantHandleQueryException.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CostBasedExecutablePlanBuilder.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CostBasedPipeBuilderFactory.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CreatesPropertyKeys.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/MutatingPattern.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/PlannerQuery.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/QueryGraph.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/QueryProjection.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/Selections.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/SimpleTokenResolver.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/UpdateGraph.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/checkForUnresolvedTokens.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/execution/PipeExecutionBuilderContext.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/execution/PipeExecutionPlanBuilder.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CachedMetricsFactory.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CardinalityCostModel.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/Eagerness.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LeafPlannerIterable.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlan2PlanDescription.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlanIdentificationBuilder.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlanningContext.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlanningFunction.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlanningSupport.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/Metrics.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PatternExpressionPatternElementNamer.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanEventHorizon.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanSingleQuery.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanUpdates.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanWithTail.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/ProjectingSelector.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/QueryGraphSolver.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/QueryPlanner.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/QueryPlannerConfiguration.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/SimpleMetricsFactory.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/Solvable.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/SortDescription.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/StatisticsBackedCardinalityModel.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/ExpressionSelectivityCalculator.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/NodeCardinalityEstimator.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/QueryGraphCardinalityModel.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/SelectivityCombiner.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/SelectivityEstimator.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/TokenSpec.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/Triplet.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/TripletConverter.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/AdaptiveSolverStep.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPCache.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPPlanTable.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPQueryGraphSolver.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPSolver.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPSolverConfig.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPSolverStep.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPTable.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IdRegistry.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/SingleComponentPlanner.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/cartesianProductsOrValueJoins.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/expandSolverStep.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/joinSolverStep.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/package.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/package.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/patternExpressionRewriter.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Aggregation.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/AllNodesScan.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/AntiConditionalApply.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Apply.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Argument.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/AssertSameNode.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/CartesianProduct.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ConditionalApply.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/CreateNode.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/CreateRelationship.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DeleteExpression.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DeleteNode.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DeletePath.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DeleteRelationship.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DetachDeleteExpression.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DetachDeleteNode.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DetachDeletePath.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/DirectedRelationshipByIdSeek.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Eager.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/EmptyResult.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ErrorPlan.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Expand.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/FindShortestPaths.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ForeachApply.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LegacyIndexSeek.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LetSelectOrSemiApply.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LetSemiApply.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Limit.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LoadCSV.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LogicalPlan.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/MergeCreateNode.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/MergeCreateRelationship.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeByIdSeek.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeByLabelScan.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeCountFromCountStore.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeHashJoin.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeIndexContainsScan.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeIndexEndsWithScan.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeIndexScan.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeIndexSeek.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NodeUniqueIndexSeek.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/NonSargable.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Optional.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/OuterHashJoin.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/PatternRelationship.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ProcedureCall.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ProduceResult.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ProjectEndpoints.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Projection.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/RelationshipCountFromCountStore.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/RemoveLabels.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/RepeatableRead.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/RollUpApply.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Sargable.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SeekRhs.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SelectOrSemiApply.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Selection.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SemiApply.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SetLabels.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SetNodePropertiesFromMap.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SetNodeProperty.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SetRelationshipPropertiesFromMap.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SetRelationshipPropery.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SingleRow.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Skip.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Sort.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Strictness.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/TriadicSelection.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/UndirectedRelationshipByIdSeek.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/Union.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/UnwindCollection.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ValueHashJoin.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/LogicalPlanRewriter.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/cleanUpEager.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/fuseSelections.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/removeIdenticalPlans.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/simplifyEquality.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/unnestApply.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/unnestOptional.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/DynamicPropertyNotifier.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/IndexSeekLeafPlanner.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/LogicalPlanProducer.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/PatternExpressionSolver.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/Selector.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/aggregation.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/allNodesLeafPlanner.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/argumentLeafPlanner.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/countStorePlanner.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/getDegreeRewriter.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/idSeekLeafPlanner.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/indexScanLeafPlanner.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/labelScanLeafPlanner.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/leafPlanOptions.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/planShortestPaths.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/projection.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/selectCovered.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/selectHasLabelWithJoin.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/selectPatternPredicates.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/solveOptionalMatches.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/sortSkipAndLimit.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/triadicSelectionFinder.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/verifyBestPlan.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/package.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/prettifier/Prettifier.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/profiler/Profiler.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/repeatWithSizeLimit.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/rewriteProcedureCalls.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/CSVResources.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/DelegatingQueryContext.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/GraphStatistics.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/IdempotentResult.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/InstrumentedGraphStatistics.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/PlanContext.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/ProcedureCallMode.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/ProcedureSignature.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/QueryContext.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/TokenContext.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/UpdateCountingQueryContext.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/symbols/SymbolTable.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/symbols/SymbolTypeAssertionCompiler.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterCondition.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterStep.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterStepSequencer.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterTask.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterTaskBuilder.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterTaskProcessor.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1}/codegen/SetStaticFieldTest.java (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ErrorPipeTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ClosingIteratorTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/IdentityMapTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/InputPositionTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/LRUCacheTest.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/NullOrderingTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/RewriteProcedureCallsTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ScopeTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ScopeTreeTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ScopeTreeVerificationTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/SeekRangeTest.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/SemanticCheckableTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/SemanticStateTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/TaskCloserTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/TypeTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/CallClauseTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/FilteringExpressionTest.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/QueryTaggerTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/QueryTagsTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/AggregationsAreIsolatedTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/CollectNodesOfTypeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/ContainsNoMatchingNodesTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/ContainsNoNodesOfTypeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/NoDuplicatesInReturnItemsTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/NormalizedEqualsArgumentsTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/conditions/OrderByOnlyOnVariablesTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/PatternExpressionConverterTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/StatementConvertersTest.scala (99%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/convert/plannerQuery/UnionStatementConvertersTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/AddUniquenessPredicatesTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/CNFNormalizerTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/CollapseInCollectionsTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/DeMorganRewriterTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/DistributeLawRewriterTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/ExpandStarTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/FlattenBooleanOperatorsTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/FoldConstantsTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/InlineProjectionsTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/InliningContextCreatorTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/InliningContextTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/IsolateAggregationTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/LiteralReplacementTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/MatchPredicateNormalizerTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NameMatchPatternElementTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NamespacerTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeArgumentOrderTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeComparisonsTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeNotEqualsTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeReturnClausesTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeSargablePredicatesTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/NormalizeWithClausesTest.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/PredicateSplitterTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/PredicateTestSupport.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/ProjectFreshSortExpressionsTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/ProjectNamedPathsTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/ReattachAliasedExpressionsTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/RewriteEqualityToInCollectionTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/RewriteTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/ast/rewriters/SimplifyPredicatesTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ResultRowImplTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/ir/expressions/CodeGenExpressionTypesTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/codegen/profiling/ProfilingTracerTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/AddTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/AllVariablesTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/AndsTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/CoalesceTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/CoercedPredicateTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/CollectionTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/ComparablePredicateTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/CreateUniqueAstTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/ExtractTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/HasLabelTests.scala (74%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/LengthFunctionTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/MatchPatternTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/MathFunctionsTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/MergeAstTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/OrsTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/PropertyValueComparisonTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/ReduceTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/RegularExpressionPredicateTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/SizeFunctionTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/SplittingPredicateTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/SubtractTest.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CoerceToTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CollectionSliceExpressionTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/CollectionTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ContainerIndexTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/DivideTest.scala (66%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ExpressionTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ExtractFunctionTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/FakeEntityTestSupport.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/GenericCaseTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/KeysFunctionTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/LabelsFunctionTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/LiteralTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PathImplTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PathValueBuilderTest.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/PropertiesFunctionTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/RangeFunctionTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/RelationshipTypeFunctionTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/SimpleCaseTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/SplitFunctionTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/StringFunctionsTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToFloatFunctionTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToIntFunctionTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/expressions/ToStringFunctionTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/groupInequalityPredicatesForLegacyTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/commands/values/KeyTokenTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/AddEagernessIfNecessaryTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/CheckForEagerLoadCsvTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/CompiledExecutionResultTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/EffectsTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/ExecutionWorkflowBuilderTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/FallbackPlanBuilderTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/LoadCsvIteratorTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/LoadCsvPeriodicCommitObserverTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/PartiallySolvedQueryTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/PlanFingerprintReferenceTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/QueryTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/RuleExecutablePlanBuilderTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/AggregationBuilderTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/BuilderTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ColumnFilterBuilderTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/CreateMissingNodesTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/DeleteAndPropertySetBuilderTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/DistinctBuilderTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/EmptyResultBuilderTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/EntityProducerFactoryTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ExtractBuilderTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/FilterBuilderTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/IfElseIteratorTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/IndexLookupBuilderTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/LoadCSVBuilderTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MatchBuilderTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MergeIntoBuilderTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/MergeStartPointBuilderTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/NamedPathBuilderTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/NodeFetchStrategyTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/PatternGraphBuilderTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/PredicateRewriterTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/ShortestPathBuilderTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/SliceBuilderTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/SortBuilderTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/StartPointBuilderTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/StartPointChoosingBuilderTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TopExecutablePlanBuilderTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TrailBuilderTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/TrailToStepTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UnwindBuilderTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UpdateActionBuilderTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/UpdateCommandExpanderTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/builders/prepare/KeyTokenResolverTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/executionplan/procs/ProcedureCallExecutionPlanTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ArrayBackedMapTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/CachedFunctionTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/CounterTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/EagerlyTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/LazyIterableTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/RowIteratorVisitationTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ScalaCompatibilityTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ScopeTestHelper.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/SemanticTableHelper.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/StatementHelper.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/TreeZipperTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/helpers/ZeroOneOrManyTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/ForeachActionTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/GraphElementPropertyFunctionsTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/MakeValuesNeoSafeTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/MergePatternActionNullPropertyHandlingTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/UniqueLinkTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/mutation/UpdateActionEffectfulTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/CaseExpressionTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/ConstraintTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/CypherParserTest.scala (99%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/ExpressionsTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/ListComprehensionTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/MapLiteralTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/MergeTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/ParserFixture.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/PatternPartTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/parser/PeriodicCommitHintTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/AllNodesScanPipeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ApplyPipeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ArgumentPipeTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ColumnFilterPipeTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/DistinctPipeTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EagerAggregationPipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/EagerPipeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExpandAllPipeTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ExpandIntoPipeTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/FakePipe.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyGroupingIteratorTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyIterator.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyPropertyKeyTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LazyTypesTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LetSelectOrSemiApplyPipeTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/LetSemiApplyPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/MergeIntoPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NiceHasherTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeByIdSeekPipeTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeByLabelScanPipeTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeCountFromCountStorePipeTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeHashJoinPipeTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeIndexScanPipeTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeIndexSeekPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/NodeOuterHashJoinPipeTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalExpandAllPipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalExpandIntoPipeTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/OptionalPipeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/PipeEffectsTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/PipeTestSupport.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProcedureCallPipeTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProduceResultsPipeTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ProjectEndpointsPipeTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/QueryStateHelper.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/QueryStateTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RelationshipCountFromCountStorePipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RollUpApplyPipeTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/RuleSortPipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SelectOrSemiApplyPipeTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SemiApplyPipeTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SetPropertyPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SlicePipeTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/SortPipeTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/StartPipePlanDescriptionTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/Top1WithTiesPipeTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/TopPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/TriadicSelectionPipeTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnionIteratorTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnionPipeTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/UnwindPipeTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/ValueHashJoinPipeTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/VarLengthExpandPipeTest.scala (99%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/AggregateTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/AvgFunctionTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/CollectFunctionTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/CountTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/MaxFunctionTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/MinFunctionTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/PercentileFunctionsTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/StdevFunctionTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/aggregation/SumFunctionTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/ExpanderStepReversalTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/HistoryTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/PatternRelationshipTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/StepSizeTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/pipes/matching/VariableLengthExpanderStepReversalTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/InternalPlanDescriptionTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/PlanDescriptionArgumentSerializerTests.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/RenderSummaryTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planDescription/RenderTreeTableTest.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/AstRewritingTestSupport.scala (79%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/BeLikeMatcher.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/CheckForUnresolvedTokensTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/DbStructureGraphStatistics.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/DbStructureLogicalPlanningConfiguration.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/LogicalPlanConstructionTestSupport.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/LogicalPlanningConfiguration.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/LogicalPlanningTestSupport.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/LogicalPlanningTestSupport2.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/PlannerQueryTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/QueryGraphTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/RealLogicalPlanningConfiguration.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/SelectionsTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/SemanticTableBuilder.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/SemanticTableTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/SimpleTokenResolverTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/StubbedLogicalPlanningConfiguration.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/UpdateGraphTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/execution/PipeExecutionPlanBuilderTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/execution/convert/PathExpressionConversionTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/BenchmarkCardinalityEstimationTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CardinalityCostModelTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CardinalitySupport.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CartesianProductPlanningIntegrationTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CreateNodePlanningIntegrationTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/CreateRelationshipPlanningIntegrationTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/DefaultQueryPlannerTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/ExpandPlanningIntegrationTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/FindShortestPathsPlanningIntegrationTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LeafPlanningIntegrationTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlan2PlanDescriptionTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/LogicalPlanIdentificationBuilderTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/MergeNodePlanningIntegrationTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/MergeRelationshipPlanningIntegrationTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/MetricsTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/NodeHashJoinPlanningIntegrationTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/OptionalMatchPlanningIntegrationTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PatternExpressionPatternElementNamerTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PatternPredicatePlanningIntegrationTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PickBestPlanUsingHintsAndCostTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanEventHorizonTest.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PlanRewritingPlanningIntegrationTest.scala (77%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/PriorityLeafPlannerListTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/QueryGraphConnectedComponentsTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/QueryGraphProducer.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/SingleRowPlanningIntegrationTest.scala (78%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/SolvablesTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/StatisticsBackedCardinalityModelTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/UnionPlanningIntegrationTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/WithPlanningIntegrationTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/CardinalityData.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/CardinalityModelTestHelper.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/CardinalityTestHelper.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala (80%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/SelectivityCombinerTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/TripletConverterTest.scala (81%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/cardinality/triplet/TripletTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/ExpandSolverStepTest.scala (88%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPQueryGraphSolverTest.scala (98%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPSolverTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/IDPTableTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/idp/JoinSolverStepTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/patternExpressionRewriterTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/AllNodesLeafPlannerTest.scala (82%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/ArgumentLeafPlannerTest.scala (86%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/IdSeekLeafPlannerTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/IndexLeafPlannerTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/IndexScanLeafPlannerTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/IndexSeekLeafPlannerTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/InequalityRangeSeekableTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LabelScanLeafPlannerTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/LogicalPlanTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/SargableTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/FuseSelectionsTest.scala (84%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/SimplifyEqualityTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/UnnestApplyTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/UnnestOptionalTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/cleanUpEagerTest.scala (89%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/AggregationTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/ExtractBestPlanTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/LegacyHintLeafPlannerTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/OuterHashJoinTest.scala (83%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/PatternExpressionSolverTest.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/ProjectionTest.scala (87%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/SelectCoveredTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/SelectHasLabelWithJoinTest.scala (85%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/SelectPatternPredicatesTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/SortSkipAndLimitTest.scala (91%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/TriadicSelectionFinderTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/steps/countStorePlannerTest.scala (92%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/planner/logical/unnestEagerTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/prettifier/PrettifierParserTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/prettifier/PrettifierTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/profiler/ProfilerTest.scala (93%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/CSVResourcesTest.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/GraphStatisticsSnapshotTest.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/QueryContextAdaptation.scala (96%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/spi/UpdateCountingQueryContextTest.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/symbols/SymbolTableTest.scala (90%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/CreateTempFileTestSupport.scala (97%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/CustomMatchers.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/RandomizedTestSupport.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/TestableIterator.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/WindowsStringSafe.scala (94%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/test_helpers/testRandomizer.scala (95%)
 rename community/cypher/{cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0 => cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1}/tracing/rewriters/RewriterStepSequencerTest.scala (94%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/AllShortestPathsPipeTest.scala (84%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/CompilerComparisonTest.scala (97%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/CreateNodeActionTest.scala (90%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/CreateRelationshipTest.scala (92%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/CypherCompilerAstCacheAcceptanceTest.scala (95%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/DoubleCheckCreateUniqueTest.scala (94%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/LabelActionTest.scala (88%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/LazyTest.scala (96%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/MapPropertySetActionTest.scala (94%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/MatchingContextTest.scala (96%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/MutationTest.scala (92%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/PathExpressionTest.scala (85%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/PatternMatchingTest.scala (85%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/PatternNodeTest.scala (89%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/PipeLazynessTest.scala (91%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/QueryStateHelper.scala (93%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/QueryStateTestSupport.scala (93%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/RuleExecutablePlanBuilderTest.scala (91%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/ScalaPatternMatchingTest.scala (94%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/SemanticIndexAcceptanceTest.scala (98%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/SimplePatternMatchingTest.scala (89%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/SingleShortestPathPipeTest.scala (87%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/TrailDecomposeTest.scala (97%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/TraversalMatcherBuilderTest.scala (89%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/TraversalMatcherTest.scala (94%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/TriadicIntegrationTest.scala (99%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/VariableLengthExpanderStepExpandTest.scala (96%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/codegen/CodeGeneratorTest.scala (98%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/codegen/ir/BuildProbeTableInstructionsTest.scala (96%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/codegen/ir/CodeGenExpressionCompilationTest.scala (92%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/codegen/ir/CodeGenSugar.scala (91%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/codegen/ir/CompiledProfilingTest.scala (83%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/commands/expressions/LiteralMapTest.scala (86%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/pipes/ActualCostCalculationTest.scala (97%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/pipes/MatchPipeTest.scala (82%)
 rename community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/{v3_0 => v3_1}/pipes/NamedPathPipeTest.scala (94%)
 rename community/cypher/{frontend-3.0 => frontend-3.1}/LICENSES.txt (100%)
 rename community/cypher/{frontend-3.0 => frontend-3.1}/NOTICE.txt (100%)
 rename community/cypher/{frontend-3.0 => frontend-3.1}/pom.xml (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/Bound.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/CypherException.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/Foldable.scala (99%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/IdentityMap.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/InputPosition.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/NameId.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/Ref.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/Rewritable.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/SemanticCheck.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/SemanticDirection.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/SemanticError.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/SemanticState.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/SemanticTable.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ASTAnnotationMap.scala (92%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ASTNode.scala (92%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/AndedPropertyInequalities.scala (82%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ArithmeticFunctions.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/CaseExpression.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Clause.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/CoerceTo.scala (81%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Collection.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Command.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ConstantExpression.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/CountStar.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Expression.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Function.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/FunctionInvocation.scala (92%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/GetDegree.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/HasLabels.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Hint.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/IsAggregate.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/IterableExpressions.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Limit.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Literal.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/MapExpression.scala (82%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/MergeAction.scala (91%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/NameToken.scala (92%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/OperatorExpression.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Order.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Parameter.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PathExpression.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Pattern.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PatternExpression.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PeriodicCommitHint.scala (92%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PredicateExpressions.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ProcedureResultItem.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Property.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Query.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Range.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/RemoveItem.scala (88%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ReturnItem.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ScopeExpression.scala (91%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/SetItem.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ShortestPathExpression.scala (91%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Skip.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Statement.scala (89%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/SymbolicName.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Variable.scala (90%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/Where.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/connectedComponents.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/containsAggregate.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Abs.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Acos.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Asin.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Atan.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Atan2.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Avg.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Ceil.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Coalesce.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Collect.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Cos.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Cot.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Count.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Degrees.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Distance.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/E.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/EndNode.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Exists.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Exp.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Floor.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Has.scala (82%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Haversin.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Head.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Id.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Keys.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/LTrim.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Labels.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Last.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Left.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Length.scala (82%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Log.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Log10.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Lower.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Max.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Min.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Nodes.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/PercentileCont.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/PercentileDisc.scala (82%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Pi.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Point.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Properties.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/RTrim.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Radians.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Rand.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Range.scala (86%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Reduce.scala (88%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Relationships.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Rels.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Replace.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Reverse.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Right.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Round.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Sign.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Sin.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Size.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Split.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Sqrt.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/StartNode.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/StdDev.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/StdDevP.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Substring.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Sum.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Tail.scala (83%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Tan.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Timestamp.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToFloat.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToInt.scala (85%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToLower.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToString.scala (87%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToUpper.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Trim.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Type.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/Upper.scala (84%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/hasAggregateButIsNotAggregate.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/Eagerly.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/NonEmptyList.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/StringHelper.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/TreeZipper.scala (99%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/fixedPoint.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/notification/InternalNotification.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/package.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Base.scala (99%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/BufferPosition.scala (91%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Clauses.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Command.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/CypherParser.scala (91%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Expressions.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/InvalidInputErrorFormatter.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/LikePatternParser.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Literals.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Patterns.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/ProcedureCalls.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Query.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/StartPoints.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Statement.scala (90%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/Strings.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/convertLikePatternToRegex.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/matchers/IdentifierPartMatcher.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/matchers/IdentifierStartMatcher.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/matchers/ScalaCharMatcher.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/matchers/WhitespaceCharMatcher.scala (93%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/package.scala (90%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/spi/MapToPublicExceptions.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/AnyType.scala (95%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/BooleanType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/CypherType.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/FloatType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/IntegerType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/ListType.scala (97%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/MapType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/NodeType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/NumberType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/PathType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/PointType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/RelationshipType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/StringType.scala (94%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/TypeRange.scala (98%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/TypeSpec.scala (99%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/package.scala (96%)
 rename community/cypher/{frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/type_system.txt (100%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/DummyPosition.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/FoldableTest.scala (95%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/RepeatTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/RewritableTest.scala (98%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ASTNodeTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/AddTest.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/AndTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/AstConstructionTestSupport.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/CaseExpressionTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/CollectionSliceTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ConnectedComponentsTest.scala (95%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ConstantExpressionTest.scala (87%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ContainerIndexTest.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ContainsAggregateTest.scala (91%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/DecimalDoubleLiteralTest.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/DivideTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/DummyExpression.scala (84%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ExpressionTest.scala (95%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ExtractExpressionTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/FilterExpressionTest.scala (88%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/FindDuplicateRelationshipsTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/FunctionNameTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/GreaterThanOrEqualTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/GreaterThanTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/HexIntegerLiteralTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/InfixExpressionTestBase.scala (86%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/IsAggregateTest.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/LessThanOrEqualTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/LessThanTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ListComprehensionTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/LoadCSVTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ModuloTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/MultiplyTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/OctalIntegerLiteralTest.scala (88%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/OrTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PeriodicCommitHintTest.scala (95%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/PowTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ProjectionClauseTest.scala (97%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ReduceExpressionTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/ReturnItemsTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/SetClauseTest.scala (85%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/SignedDecimalIntegerLiteralTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/StatementReturnColumnsTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/StringLiteralTest.scala (83%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/SubtractTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/UnsignedDecimalIntegerLiteralTest.scala (87%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/VariableTest.scala (84%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/XorTest.scala (89%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/AbsTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/DistanceTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/FunctionTestBase.scala (84%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/LabelsTest.scala (91%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/PercentileContTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/PercentileDiscTest.scala (90%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/PointTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/SplitTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToFloatTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToIntTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/ast/functions/ToStringTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/NonEmptyListTest.scala (98%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/helpers/StringHelperTest.scala (92%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/BaseRulesTest.scala (95%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/ComparisonTest.scala (91%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/LiteralsTest.scala (96%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/ParserAstTest.scala (91%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/ParserTest.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/parser/ProcedureCallParserTest.scala (94%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/CypherTypeTest.scala (96%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/TypeRangeTest.scala (98%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/symbols/TypeSpecTest.scala (99%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/test_helpers/CypherFunSuite.scala (96%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/test_helpers/CypherTestSupport.scala (93%)
 rename community/cypher/{frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0 => frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1}/test_helpers/IgnoreAllTests.scala (95%)

diff --git a/community/cypher/acceptance/pom.xml b/community/cypher/acceptance/pom.xml
index c0be9bd2fbf39..92decedb2fa3e 100644
--- a/community/cypher/acceptance/pom.xml
+++ b/community/cypher/acceptance/pom.xml
@@ -154,7 +154,7 @@
     <!-- neo4j-cypher -->
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
@@ -200,7 +200,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
@@ -208,7 +208,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/FunctionsAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/FunctionsAcceptanceTest.scala
index 318cd6f4dec24..0d25677e61c31 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/FunctionsAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/FunctionsAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CRS, CartesianPoint, GeographicPoint}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CRS, CartesianPoint, GeographicPoint}
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
 
 class FunctionsAcceptanceTest extends ExecutionEngineFunSuite with NewPlannerTestSupport {
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LabelsAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LabelsAcceptanceTest.scala
index b2e5d3e9e4986..d2ebdb8d719fe 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LabelsAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LabelsAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 import org.neo4j.cypher.{CypherException, ExecutionEngineFunSuite, QueryStatisticsTestSupport}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LoadCsvAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LoadCsvAcceptanceTest.scala
index be4daf5d098b7..62f85f4445691 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LoadCsvAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/LoadCsvAcceptanceTest.scala
@@ -23,8 +23,8 @@ import java.io.{File, PrintWriter}
 import java.net.{URLConnection, URLStreamHandler, URLStreamHandlerFactory, URL}
 import org.neo4j.cypher._
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
 import org.neo4j.graphdb.security.URLAccessRule
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAcceptanceTest.scala
index e21eb2238fda0..e50677056f0cf 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAcceptanceTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.internal.cypher.acceptance
 
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
 import org.neo4j.graphdb._
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAggregationsBackedByCountStoreAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAggregationsBackedByCountStoreAcceptanceTest.scala
index a9eb19130beb8..7961f0140f50b 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAggregationsBackedByCountStoreAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAggregationsBackedByCountStoreAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
 import org.neo4j.cypher.{NewPlannerTestSupport, QueryStatisticsTestSupport, ExecutionEngineFunSuite}
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
index da277335cd273..b91a927b5c356 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
@@ -23,8 +23,8 @@ import java.nio.file.Files
 import java.util
 
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.IDPSolverMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.IDPSolverMonitor
 import org.neo4j.cypher.internal.{ExecutionEngine, PlanDescription}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.config.Setting
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MergeIntoAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MergeIntoAcceptanceTest.scala
index 15d1d628ef680..19b18ac617354 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MergeIntoAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MergeIntoAcceptanceTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.internal.cypher.acceptance
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class MergeIntoAcceptanceTest extends ExecutionEngineFunSuite{
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/OrderByAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/OrderByAcceptanceTest.scala
index 95883a45032b1..0cc11bdf87b68 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/OrderByAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/OrderByAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CustomMatchers
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CustomMatchers
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
 
 class OrderByAcceptanceTest extends ExecutionEngineFunSuite with CustomMatchers with NewPlannerTestSupport {
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternExpressionAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternExpressionAcceptanceTest.scala
index 6145dd192fccb..0c22278d361d3 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternExpressionAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PatternExpressionAcceptanceTest.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
 import org.neo4j.graphdb.{Node, Relationship}
 import org.scalatest.Matchers
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PeriodicCommitAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PeriodicCommitAcceptanceTest.scala
index 5ae0c9284467a..22ce89ebce12d 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PeriodicCommitAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PeriodicCommitAcceptanceTest.scala
@@ -22,10 +22,10 @@ package org.neo4j.internal.cypher.acceptance
 import java.io.PrintWriter
 
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Planner
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Planner
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
 import org.neo4j.cypher.internal.helpers.TxCounts
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PreParsingAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PreParsingAcceptanceTest.scala
index d436ede2c7410..fb60f45a8d378 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PreParsingAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/PreParsingAcceptanceTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.internal.cypher.acceptance
 
 import org.neo4j.cypher.internal.ExtendedExecutionResult
 import org.neo4j.cypher.internal.compatibility.CompatibilityPlanDescriptionFor3_0
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import org.neo4j.cypher.ExecutionEngineFunSuite
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/QueryPlanCompactionAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/QueryPlanCompactionAcceptanceTest.scala
index 04a0de45963d7..d3f483850e5e7 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/QueryPlanCompactionAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/QueryPlanCompactionAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
 import org.neo4j.cypher.{NewPlannerTestSupport, QueryStatisticsTestSupport, ExecutionEngineFunSuite}
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ReturnAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ReturnAcceptanceTest.scala
index 9469ec7fd154a..f0bfc16ed7ac8 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ReturnAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ReturnAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CustomMatchers
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CustomMatchers
 import org.neo4j.cypher.{EntityNotFoundException, ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
 import org.neo4j.graphdb._
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathAcceptanceTest.scala
index dbe0907730b7d..0cadb55b0612c 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
 import org.neo4j.graphdb.Node
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathExhaustiveForbiddenAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathExhaustiveForbiddenAcceptanceTest.scala
index 26d4e442aba31..b3029964775c6 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathExhaustiveForbiddenAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathExhaustiveForbiddenAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.frontend.v3_0.notification.ExhaustiveShortestPathForbiddenNotification
-import org.neo4j.cypher.internal.frontend.v3_0.{ExhaustiveShortestPathForbiddenException => InternalExhaustiveShortestPathForbiddenException, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.ExhaustiveShortestPathForbiddenNotification
+import org.neo4j.cypher.internal.frontend.v3_1.{ExhaustiveShortestPathForbiddenException => InternalExhaustiveShortestPathForbiddenException, InputPosition}
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, ExhaustiveShortestPathForbiddenException}
 import org.neo4j.graphdb.Node
 import org.neo4j.graphdb.config.Setting
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathLongerAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathLongerAcceptanceTest.scala
index f5f9b506ee761..b5f10d9ce877d 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathLongerAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/ShortestPathLongerAcceptanceTest.scala
@@ -23,10 +23,10 @@ import java.util
 
 import org.neo4j.cypher.internal.RewindableExecutionResult
 import org.neo4j.cypher.internal.compatibility.ExecutionResultWrapperFor3_0
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Rows
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Rows
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
 import org.neo4j.graphalgo.impl.path.ShortestPath
 import org.neo4j.graphalgo.impl.path.ShortestPath.DataMonitor
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StartsWithAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StartsWithAcceptanceTest.scala
index 8725beca20d7d..6ad8f4cb0ad11 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StartsWithAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StartsWithAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, QueryStatisticsTestSupport}
 import org.neo4j.graphdb.{Node, ResourceIterator}
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StatisticsPlanningAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StatisticsPlanningAcceptanceTest.scala
index 8904dede096de..d6e8543480cca 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StatisticsPlanningAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/StatisticsPlanningAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
 import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/UsingAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/UsingAcceptanceTest.scala
index 992f7e6f8bdca..1b1389fd569b1 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/UsingAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/UsingAcceptanceTest.scala
@@ -19,10 +19,10 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.internal.compiler.v3_0.IDPPlannerName
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{NodeHashJoin, NodeIndexSeek}
+import org.neo4j.cypher.internal.compiler.v3_1.IDPPlannerName
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{NodeHashJoin, NodeIndexSeek}
 import org.neo4j.cypher.{ExecutionEngineFunSuite, HintException, IndexHintException, NewPlannerTestSupport, SyntaxException, _}
 import org.neo4j.graphdb.schema.Schema
 import org.neo4j.graphdb.{QueryExecutionException, Result}
diff --git a/community/cypher/compatibility-suite/pom.xml b/community/cypher/compatibility-suite/pom.xml
index 8c5c6bdec5c0d..c0354816b5be1 100644
--- a/community/cypher/compatibility-suite/pom.xml
+++ b/community/cypher/compatibility-suite/pom.xml
@@ -172,7 +172,7 @@
     <!-- neo4j-cypher -->
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
       <exclusions>
diff --git a/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/JsonResult.scala b/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/JsonResult.scala
index 9d55038888076..dfa1fdf18e08a 100644
--- a/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/JsonResult.scala
+++ b/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/JsonResult.scala
@@ -20,7 +20,7 @@
 package cypher.cucumber.reporter
 
 import com.novus.salat.annotations.{Ignore, Key, Persist}
-import org.neo4j.cypher.internal.compiler.v3_0.ast.QueryTag
+import org.neo4j.cypher.internal.compiler.v3_1.ast.QueryTag
 
 import scala.annotation.meta.getter
 
diff --git a/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/OutputProducer.scala b/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/OutputProducer.scala
index 850149b1a499d..6bb428ec7e47b 100644
--- a/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/OutputProducer.scala
+++ b/community/cypher/compatibility-suite/src/test/scala/cypher/cucumber/reporter/OutputProducer.scala
@@ -19,7 +19,7 @@
  */
 package cypher.cucumber.reporter
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.QueryTagger
+import org.neo4j.cypher.internal.compiler.v3_1.ast.QueryTagger
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/.gitignore b/community/cypher/cypher-compiler-3.1/.gitignore
similarity index 100%
rename from community/cypher/cypher-compiler-3.0/.gitignore
rename to community/cypher/cypher-compiler-3.1/.gitignore
diff --git a/community/cypher/cypher-compiler-3.0/LICENSE.txt b/community/cypher/cypher-compiler-3.1/LICENSE.txt
similarity index 100%
rename from community/cypher/cypher-compiler-3.0/LICENSE.txt
rename to community/cypher/cypher-compiler-3.1/LICENSE.txt
diff --git a/community/cypher/cypher-compiler-3.0/LICENSES.txt b/community/cypher/cypher-compiler-3.1/LICENSES.txt
similarity index 100%
rename from community/cypher/cypher-compiler-3.0/LICENSES.txt
rename to community/cypher/cypher-compiler-3.1/LICENSES.txt
diff --git a/community/cypher/cypher-compiler-3.0/NOTICE.txt b/community/cypher/cypher-compiler-3.1/NOTICE.txt
similarity index 100%
rename from community/cypher/cypher-compiler-3.0/NOTICE.txt
rename to community/cypher/cypher-compiler-3.1/NOTICE.txt
diff --git a/community/cypher/cypher-compiler-3.0/README.txt b/community/cypher/cypher-compiler-3.1/README.txt
similarity index 100%
rename from community/cypher/cypher-compiler-3.0/README.txt
rename to community/cypher/cypher-compiler-3.1/README.txt
diff --git a/community/cypher/cypher-compiler-3.0/pom.xml b/community/cypher/cypher-compiler-3.1/pom.xml
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/pom.xml
rename to community/cypher/cypher-compiler-3.1/pom.xml
index 175839566c38d..d05e35146076b 100644
--- a/community/cypher/cypher-compiler-3.0/pom.xml
+++ b/community/cypher/cypher-compiler-3.1/pom.xml
@@ -8,11 +8,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+  <artifactId>neo4j-cypher-compiler-3.1</artifactId>
   <packaging>jar</packaging>
   <version>3.1.0-SNAPSHOT</version>
-  <name>Neo4j - Cypher Compiler 3.0</name>
-  <description>Compiler for Cypher 3.0</description>
+  <name>Neo4j - Cypher Compiler 3.1</name>
+  <description>Compiler for Cypher 3.1</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
 
   <scm>
@@ -133,7 +133,7 @@
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.1</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -148,7 +148,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/CompilationPhaseTracer.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/CompilationPhaseTracer.java
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/CompilationPhaseTracer.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/CompilationPhaseTracer.java
index 64a7341fade8c..d0bfd98925828 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/CompilationPhaseTracer.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/CompilationPhaseTracer.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0;
+package org.neo4j.cypher.internal.compiler.v3_1;
 
 public interface CompilationPhaseTracer
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionTracer.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionTracer.java
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionTracer.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionTracer.java
index 621618403b1e4..9abe84059d153 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionTracer.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionTracer.java
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen;
+package org.neo4j.cypher.internal.compiler.v3_1.codegen;
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id;
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id;
 
 public interface QueryExecutionTracer
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImpl.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImpl.java
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImpl.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImpl.java
index 4ddb58897fe2e..b69952c997024 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImpl.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImpl.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen;
+package org.neo4j.cypher.internal.compiler.v3_1.codegen;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultRow;
+import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultRow;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
 import org.neo4j.graphdb.Relationship;
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracer.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracer.java
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracer.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracer.java
index dcdb3a6fa6a76..53daf59984d19 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracer.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracer.java
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.profiling;
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionEvent;
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionTracer;
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id;
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionEvent;
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionTracer;
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id;
 
 public class ProfilingTracer implements QueryExecutionTracer
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQuery.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQuery.java
similarity index 75%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQuery.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQuery.java
index 0bb40336c941b..a230b50cf7700 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQuery.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQuery.java
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan;
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan;
 
 import java.util.Map;
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionMode;
-import org.neo4j.cypher.internal.compiler.v3_0.TaskCloser;
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionTracer;
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription;
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext;
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionMode;
+import org.neo4j.cypher.internal.compiler.v3_1.TaskCloser;
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionTracer;
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription;
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext;
 
 public interface GeneratedQuery
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQueryExecution.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQueryExecution.java
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQueryExecution.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQueryExecution.java
index da5d97e45693b..f30f44f490943 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/executionplan/GeneratedQueryExecution.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/executionplan/GeneratedQueryExecution.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan;
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan;
 
 import java.util.List;
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionMode;
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription;
-import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultVisitor;
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionMode;
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription;
+import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultVisitor;
 
 public interface GeneratedQueryExecution
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultRow.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultRow.java
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultRow.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultRow.java
index 367cbdc85ba69..fa8f498f0a05d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultRow.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultRow.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi;
+package org.neo4j.cypher.internal.compiler.v3_1.spi;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
diff --git a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultVisitor.java b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultVisitor.java
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultVisitor.java
rename to community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultVisitor.java
index e3939bd986dda..8e9f8f7f57309 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/java/org/neo4j/cypher/internal/compiler/v3_0/spi/InternalResultVisitor.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/java/org/neo4j/cypher/internal/compiler/v3_1/spi/InternalResultVisitor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi;
+package org.neo4j.cypher.internal.compiler.v3_1.spi;
 
 public interface InternalResultVisitor<VisitationException extends Exception>
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ASTRewriter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ASTRewriter.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ASTRewriter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ASTRewriter.scala
index 942fdb5c204f2..b099cf00e8234 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ASTRewriter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ASTRewriter.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.conditions._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters._
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.{ApplyRewriter, RewriterCondition, RewriterStepSequencer}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, SemanticState}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.conditions._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters._
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.{ApplyRewriter, RewriterCondition, RewriterStepSequencer}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, SemanticState}
 
 class ASTRewriter(rewriterSequencer: (String) => RewriterStepSequencer, shouldExtractParameters: Boolean = true) {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStep._
+  import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStep._
 
   def rewrite(queryText: String, statement: Statement, semanticState: SemanticState): (Statement, Map[String, Any], Set[RewriterCondition]) = {
     val (extractParameters, extractedParameters) = if (shouldExtractParameters)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/AbstractPattern.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/AbstractPattern.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/AbstractPattern.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/AbstractPattern.scala
index 88387441945cf..e41557ad0f19e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/AbstractPattern.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/AbstractPattern.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.GraphElementPropertyFunctions
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+package org.neo4j.cypher.internal.compiler.v3_1
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.GraphElementPropertyFunctions
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/BoundOrdering.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/BoundOrdering.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/BoundOrdering.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/BoundOrdering.scala
index ee6972f6dbfbe..d40cd2cb8765b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/BoundOrdering.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/BoundOrdering.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.Bound
+import org.neo4j.cypher.internal.frontend.v3_1.Bound
 
 // Tested by SeekRangeTest
 final case class MinBoundOrdering[T](inner: Ordering[T]) extends Ordering[Bound[T]] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CacheAccessor.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CacheAccessor.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CacheAccessor.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CacheAccessor.scala
index 49c0a97030e9a..97da0e44bbd06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CacheAccessor.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CacheAccessor.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 trait CacheAccessor[K, T] {
   def getOrElseUpdate(cache: LRUCache[K, T])(key: K, f: => T): T
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Comparer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Comparer.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Comparer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Comparer.scala
index b0a8c0e9491b8..c53e8db16ee80 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Comparer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Comparer.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException
 
 /**
  * Comparer is a trait that enables it's subclasses to compare to AnyRef with each other.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompiler.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompiler.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompiler.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompiler.scala
index 3f681f0d611f7..2e3f7d12d02a9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompiler.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompiler.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
-
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.{AST_REWRITE, PARSING, SEMANTIC_CHECK}
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.CodeStructure
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs.DelegatingProcedureExecutablePlanBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.closing
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.LogicalPlanRewriter
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{CachedMetricsFactory, DefaultQueryPlanner, SimpleMetricsFactory}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticTable, inSequence}
+package org.neo4j.cypher.internal.compiler.v3_1
+
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.{AST_REWRITE, PARSING, SEMANTIC_CHECK}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.CodeStructure
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs.DelegatingProcedureExecutablePlanBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.closing
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.LogicalPlanRewriter
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{CachedMetricsFactory, DefaultQueryPlanner, SimpleMetricsFactory}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticTable, inSequence}
 import org.neo4j.helpers.Clock
 import org.neo4j.kernel.GraphDatabaseQueryService
 
@@ -69,7 +69,7 @@ case class CypherCompilerConfiguration(queryCacheSize: Int,
                                        nonIndexedLabelWarningThreshold: Long)
 
 object CypherCompilerFactory {
-  val monitorTag = "cypher3.0"
+  val monitorTag = "cypher3.1"
 
   def costBasedCompiler(graph: GraphDatabaseQueryService, config: CypherCompilerConfiguration, clock: Clock, structure: CodeStructure[GeneratedQuery],
                         monitors: Monitors, logger: InfoLogger,
@@ -215,7 +215,7 @@ case class CypherCompiler(parser: CypherParser,
   }
 
   private def syntaxDeprecationNotifications( statement: Statement) =
-    // We don't have any deprecations in 3.0 yet
+    // We don't have any deprecations in 3.1 yet
     Seq.empty[InternalNotification]
 
   private def provideCache(cacheAccessor: CacheAccessor[Statement, ExecutionPlan],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherOrdering.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherOrdering.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherOrdering.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherOrdering.scala
index 846629674a08d..f63d8aa64a124 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherOrdering.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherOrdering.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.util.Comparator
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherSerializer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherSerializer.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherSerializer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherSerializer.scala
index 7e79643c0c3bc..db458fb63a712 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherSerializer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherSerializer.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsCollection, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsCollection, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionContext.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionContext.scala
index 879918b9cff85..f1c90eaa28720 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionContext.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import mutation.UpdateAction
 import pipes.MutableMaps
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionMode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionMode.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionMode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionMode.scala
index 9b0be3755cc71..056e912ff5139 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionMode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionMode.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.InvalidSemanticsException
+import org.neo4j.cypher.internal.frontend.v3_1.InvalidSemanticsException
 
 object ExecutionMode {
   def cantMixProfileAndExplain: Nothing =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionResultDumper.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionResultDumper.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionResultDumper.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionResultDumper.scala
index 712da56f893f8..7dda4efa808ad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExecutionResultDumper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExecutionResultDumper.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.io.{PrintWriter, StringWriter}
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
 
 case class ExecutionResultDumper(result: Seq[Map[String, Any]], columns: List[String], queryStatistics: InternalQueryStatistics) extends CypherSerializer {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExplainExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExplainExecutionResult.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExplainExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExplainExecutionResult.scala
index fde802e879e6f..68803a8f458cc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ExplainExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ExplainExecutionResult.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.io.PrintWriter
 import java.util
 import java.util.Collections
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalExecutionResult, InternalQueryType}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultVisitor
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalExecutionResult, InternalQueryType}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultVisitor
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.graphdb.ResourceIterator
 
 case class ExplainExecutionResult(columns: List[String],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HardcodedGraphStatistics.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HardcodedGraphStatistics.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HardcodedGraphStatistics.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HardcodedGraphStatistics.scala
index fcc4e345bc09c..d5c5c473a84eb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HardcodedGraphStatistics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HardcodedGraphStatistics.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.{PropertyKeyId, RelTypeId, LabelId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.{PropertyKeyId, RelTypeId, LabelId}
 
 
 case object HardcodedGraphStatistics extends HardcodedGraphStatisticsValues
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HasOptionalDefault.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HasOptionalDefault.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HasOptionalDefault.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HasOptionalDefault.scala
index 2feb89afea90d..74cff86e0e7d0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/HasOptionalDefault.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/HasOptionalDefault.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 trait HasOptionalDefault[T] {
   def default: Option[T] = None
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentitySet.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentitySet.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentitySet.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentitySet.scala
index 7bbd8832beb5f..ced8c9ca9d99c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentitySet.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentitySet.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.IdentityMap
+import org.neo4j.cypher.internal.frontend.v3_1.IdentityMap
 
 object IdentitySet {
   private val PRESENT = new Object
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalNotificationLogger.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalNotificationLogger.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalNotificationLogger.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalNotificationLogger.scala
index dfac190e09f38..ff48d97d56665 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalNotificationLogger.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalNotificationLogger.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 
 /**
  * A NotificationLogger records notifications.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalQueryStatistics.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalQueryStatistics.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalQueryStatistics.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalQueryStatistics.scala
index 79f2526d4b19f..646fee707d9bc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/InternalQueryStatistics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/InternalQueryStatistics.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 case class InternalQueryStatistics(nodesCreated: Int = 0,
                            relationshipsCreated: Int = 0,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCache.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCache.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCache.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCache.scala
index 517f652c1bbb2..2b6bd2ea84b30 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCache.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCache.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelSpec.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelSpec.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelSpec.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelSpec.scala
index c412ad5850012..4ac88686955e6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelSpec.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelSpec.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.HasLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.HasLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
 
 /**
  * LabelSpec represent parsed label sets before they are turned into either expressions or predicates
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Maybe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Maybe.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Maybe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Maybe.scala
index 703cec2964fed..1471eb0d54e13 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Maybe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Maybe.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 abstract sealed class Maybe[+T] {
   def values: Seq[T]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Monitors.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Monitors.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Monitors.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Monitors.scala
index 5403ac0baeab9..387e3ebef8931 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/Monitors.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/Monitors.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/OnAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/OnAction.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/OnAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/OnAction.scala
index 251e5b11449bc..fc0e45411b634 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/OnAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/OnAction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.SetAction
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.SetAction
 
 case class OnAction(verb: Action, set: Seq[SetAction])
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeExecutionResult.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeExecutionResult.scala
index 5991b825e14c5..39595a7d25ba6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeExecutionResult.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.io.PrintWriter
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalExecutionResult, InternalQueryType}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CollectionSupport, RuntimeJavaValueConverter}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalExecutionResult, InternalQueryType}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CollectionSupport, RuntimeJavaValueConverter}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.graphdb.{NotFoundException, ResourceIterator}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PlannerName.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PlannerName.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PlannerName.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PlannerName.scala
index 100fbfe9ef6a5..1a32ad1aead71 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PlannerName.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PlannerName.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 /**
  * This class defines the query planners used by cyphers.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PreparedQuery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PreparedQuery.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PreparedQuery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PreparedQuery.scala
index a6abd99e7d2c3..692343ca665a1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/PreparedQuery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/PreparedQuery.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.AbstractQuery
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterCondition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Query, Statement}
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, Rewriter, Scope, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.AbstractQuery
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterCondition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Query, Statement}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, Rewriter, Scope, SemanticTable}
 
 // A Cypher query goes through various stages of pre-processing before planning
 //
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ResultIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ResultIterator.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ResultIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ResultIterator.scala
index 87d456c4d080c..a5d22f298c076 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ResultIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ResultIterator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 
 import scala.collection.immutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeBuilder.scala
index c077828dfd875..857384a67e61e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeBuilder.scala
@@ -17,24 +17,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
-
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase._
-import org.neo4j.cypher.internal.compiler.v3_0.CompiledPlanBuilder.createTracer
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.profiling.ProfilingTracer
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenerator, CodeStructure}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InterpretedExecutionPlanBuilder.interpretedToExecutionPlan
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlan, GeneratedQuery, InternalExecutionResult, NewRuntimeSuccessRateMonitor, PlanFingerprint, PlanFingerprintReference, Provider, READ_ONLY}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{PeriodicCommit, CantCompileQueryException}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.execution.{PipeExecutionBuilderContext, PipeExecutionPlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{InternalNotification, RuntimeUnsupportedNotification}
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, InvalidArgumentException, SemanticTable}
+package org.neo4j.cypher.internal.compiler.v3_1
+
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase._
+import org.neo4j.cypher.internal.compiler.v3_1.CompiledPlanBuilder.createTracer
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling.ProfilingTracer
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenerator, CodeStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InterpretedExecutionPlanBuilder.interpretedToExecutionPlan
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlan, GeneratedQuery, InternalExecutionResult, NewRuntimeSuccessRateMonitor, PlanFingerprint, PlanFingerprintReference, Provider, READ_ONLY}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{PeriodicCommit, CantCompileQueryException}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.execution.{PipeExecutionBuilderContext, PipeExecutionPlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{InternalNotification, RuntimeUnsupportedNotification}
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, InvalidArgumentException, SemanticTable}
 import org.neo4j.helpers.Clock
 
 object RuntimeBuilder {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeName.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeName.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeName.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeName.scala
index 228204f865fc3..e0e64edddc3ad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/RuntimeName.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/RuntimeName.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 sealed abstract class RuntimeName {
   def name: String
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerifier.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerifier.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerifier.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerifier.scala
index 797b55abdcb19..70eb38009eb95 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerifier.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerifier.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SymbolUse, Scope, Ref}
+import org.neo4j.cypher.internal.frontend.v3_1.{SymbolUse, Scope, Ref}
 
 import scala.compat.Platform.EOL
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRange.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRange.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRange.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRange.scala
index a19c06e4b9701..1bb044aeedfde 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRange.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRange.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.{Bounds, Bound}
+import org.neo4j.cypher.internal.frontend.v3_1.{Bounds, Bound}
 
 /*
   Seek ranges describe intervals. In practice they are used to summarize all inequalities over the
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticChecker.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticChecker.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticChecker.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticChecker.scala
index da8495bec806a..48a9e4f245fea 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticChecker.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticChecker.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
 
 class SemanticChecker {
   def check(queryText: String, statement: Statement,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SyntaxExceptionCreator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SyntaxExceptionCreator.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SyntaxExceptionCreator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SyntaxExceptionCreator.scala
index 5facce08d1f1e..014976e7da66b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/SyntaxExceptionCreator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/SyntaxExceptionCreator.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherException, InputPosition, SyntaxException}
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherException, InputPosition, SyntaxException}
 
 class SyntaxExceptionCreator(queryText: String, preParserOffset: Option[InputPosition]) extends ((String, InputPosition) => CypherException) {
   override def apply(message: String, position: InputPosition): CypherException = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloser.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloser.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloser.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloser.scala
index c147df5a9aeee..0e09562865f90 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloser.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloser.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import scala.collection.mutable.ListBuffer
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/UpdateStrategy.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/UpdateStrategy.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/UpdateStrategy.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/UpdateStrategy.scala
index de7a5ba93cd7a..40fd6a9643d06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/UpdateStrategy.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/UpdateStrategy.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 
 sealed abstract class UpdateStrategy {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/NestedPipeExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/NestedPipeExpression.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/NestedPipeExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/NestedPipeExpression.scala
index c89628196b3ab..01531ebdd6580 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/NestedPipeExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/NestedPipeExpression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.Pipe
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, PathExpression, PatternExpression}
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheck, SemanticCheckResult}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.Pipe
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, PathExpression, PatternExpression}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheck, SemanticCheckResult}
 
 case class NestedPlanExpression(plan: LogicalPlan, pattern: PatternExpression)(val position: InputPosition) extends Expression {
   def semanticCheck(ctx: SemanticContext): SemanticCheck = SemanticCheckResult.success
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagger.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagger.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagger.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagger.scala
index 0521b770e1779..c7088ffbc7e45 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagger.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagger.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/ResolvedCall.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/ResolvedCall.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/ResolvedCall.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/ResolvedCall.scala
index 79b7f635de8d6..92e67ed09de27 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/ResolvedCall.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/ResolvedCall.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
-
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheckResult._
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
+package org.neo4j.cypher.internal.compiler.v3_1.ast
+
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheckResult._
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
 
 object ResolvedCall {
   def apply(signatureLookup: QualifiedProcedureName => ProcedureSignature)(unresolved: UnresolvedCall): ResolvedCall = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/SeekRangeWrapper.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/SeekRangeWrapper.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/SeekRangeWrapper.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/SeekRangeWrapper.scala
index 379c129f009af..d20cd2e9c93a4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/SeekRangeWrapper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/SeekRangeWrapper.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.compiler.v3_0.{InequalitySeekRange, PrefixRange}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheck, SemanticCheckResult}
+import org.neo4j.cypher.internal.compiler.v3_1.{InequalitySeekRange, PrefixRange}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheck, SemanticCheckResult}
 
 case class PrefixSeekRangeWrapper(range: PrefixRange[Expression])(val position: InputPosition) extends Expression {
   override def semanticCheck(ctx: SemanticContext): SemanticCheck = SemanticCheckResult.success
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/aggregationsAreIsolated.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/aggregationsAreIsolated.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/aggregationsAreIsolated.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/aggregationsAreIsolated.scala
index b437567aaf572..754a8d5a7a8cf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/aggregationsAreIsolated.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/aggregationsAreIsolated.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{hasAggregateButIsNotAggregate, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{hasAggregateButIsNotAggregate, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
 
 case object aggregationsAreIsolated extends Condition {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/collectNodesOfType.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/collectNodesOfType.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/collectNodesOfType.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/collectNodesOfType.scala
index c1a05b62b80b4..71579b75fbaa4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/collectNodesOfType.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/collectNodesOfType.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ASTNode
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ASTNode
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNamedPathOnlyForShortestPath.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNamedPathOnlyForShortestPath.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNamedPathOnlyForShortestPath.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNamedPathOnlyForShortestPath.scala
index a352e42cb5195..b9e76d6e19519 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNamedPathOnlyForShortestPath.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNamedPathOnlyForShortestPath.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{NamedPatternPart, ShortestPaths}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{NamedPatternPart, ShortestPaths}
 
 case object containsNamedPathOnlyForShortestPath extends Condition {
   private val matcher = containsNoMatchingNodes({
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoMatchingNodes.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoMatchingNodes.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoMatchingNodes.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoMatchingNodes.scala
index 97232a619b056..2587124720abf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoMatchingNodes.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoMatchingNodes.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ASTNode
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ASTNode
 
 case class containsNoMatchingNodes(matcher: PartialFunction[ASTNode, String]) extends (Any => Seq[String]) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoNodesOfType.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoNodesOfType.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoNodesOfType.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoNodesOfType.scala
index 00b35663e3eb1..c8528ce13d7ec 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoNodesOfType.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoNodesOfType.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ASTNode
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ASTNode
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoReturnAll.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoReturnAll.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoReturnAll.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoReturnAll.scala
index d349274e5132a..4a1f374172164 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/containsNoReturnAll.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/containsNoReturnAll.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ReturnItems
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ReturnItems
 
 case object containsNoReturnAll extends Condition {
   private val matcher = containsNoMatchingNodes({
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noDuplicatesInReturnItems.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noDuplicatesInReturnItems.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noDuplicatesInReturnItems.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noDuplicatesInReturnItems.scala
index afc55cf86698e..6b2578c14ab19 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noDuplicatesInReturnItems.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noDuplicatesInReturnItems.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ReturnItems
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ReturnItems
 
 case object noDuplicatesInReturnItems extends Condition {
   def apply(that: Any): Seq[String] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noReferenceEqualityAmongVariables.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noReferenceEqualityAmongVariables.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noReferenceEqualityAmongVariables.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noReferenceEqualityAmongVariables.scala
index 4613ba52241d7..39682255bbe1b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noReferenceEqualityAmongVariables.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noReferenceEqualityAmongVariables.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.Ref
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.Ref
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
 
 case object noReferenceEqualityAmongVariables extends Condition {
   def apply(that: Any): Seq[String] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noUnnamedPatternElementsInMatch.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noUnnamedPatternElementsInMatch.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noUnnamedPatternElementsInMatch.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noUnnamedPatternElementsInMatch.scala
index c99355eceea64..fe2f79c001ace 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/noUnnamedPatternElementsInMatch.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/noUnnamedPatternElementsInMatch.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Match, NodePattern, RelationshipPattern}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Match, NodePattern, RelationshipPattern}
 
 case object noUnnamedPatternElementsInMatch extends Condition {
   def apply(that: Any): Seq[String] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/normalizedEqualsArguments.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/normalizedEqualsArguments.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/normalizedEqualsArguments.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/normalizedEqualsArguments.scala
index 048deead09331..e7063e7bea89e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/normalizedEqualsArguments.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/normalizedEqualsArguments.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, FunctionInvocation, Property, Equals}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, FunctionInvocation, Property, Equals}
 
 case object normalizedEqualsArguments extends Condition {
   def apply(that: Any): Seq[String] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/orderByOnlyOnVariables.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/orderByOnlyOnVariables.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/orderByOnlyOnVariables.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/orderByOnlyOnVariables.scala
index a4a061dad13db..992595d1adc26 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/orderByOnlyOnVariables.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/orderByOnlyOnVariables.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Variable, OrderBy, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.Condition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Variable, OrderBy, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.Condition
 
 case object orderByOnlyOnVariables extends Condition {
   def apply(that: Any): Seq[String] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/ExpressionConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/ExpressionConverters.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/ExpressionConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/ExpressionConverters.scala
index 6fd703dddfa17..800e22cc17a8f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/ExpressionConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/ExpressionConverters.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.{InequalitySeekRangeWrapper, NestedPipeExpression, PrefixSeekRangeWrapper}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.ProjectedPath._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression => CommandExpression, InequalitySeekRangeExpression, ProjectedPath}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedRelType
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => commandexpressions, predicates, values => commandvalues}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.{InequalitySeekRangeWrapper, NestedPipeExpression, PrefixSeekRangeWrapper}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.ProjectedPath._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression => CommandExpression, InequalitySeekRangeExpression, ProjectedPath}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedRelType
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => commandexpressions, predicates, values => commandvalues}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection, ast}
 import org.neo4j.graphdb.Direction
 
 object ExpressionConverters {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/OtherConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/OtherConverters.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/OtherConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/OtherConverters.scala
index 40f18d6a1c5df..4a8ee0b8588b1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/OtherConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/OtherConverters.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
 
 object OtherConverters {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/PatternConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/PatternConverters.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/PatternConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/PatternConverters.scala
index bd14fd05b7976..62eb7fec42d09 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/PatternConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/PatternConverters.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression => CommandExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => commandexpressions, values => commandvalues}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection, SyntaxException, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression => CommandExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => commandexpressions, values => commandvalues}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection, SyntaxException, ast}
 
 object PatternConverters {
   implicit class PatternConverter(val pattern: ast.Pattern) extends AnyVal {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/StatementConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/StatementConverters.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/StatementConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/StatementConverters.scala
index bdf96956f163a..48c5507d089ea 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/commands/StatementConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/commands/StatementConverters.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{And, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => commandexpressions, values => commandvalues, _}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.SetAction
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SetClause
-import org.neo4j.cypher.internal.frontend.v3_0.notification.JoinHintUnsupportedNotification
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{And, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => commandexpressions, values => commandvalues, _}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.SetAction
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SetClause
+import org.neo4j.cypher.internal.frontend.v3_1.notification.JoinHintUnsupportedNotification
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, ast}
 
 object StatementConverters {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ClauseConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ClauseConverters.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ClauseConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ClauseConverters.scala
index d151c8529530c..01c14bc0b54aa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ClauseConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ClauseConverters.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{HasHeaders, NoHeaders}
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticTable, SyntaxException}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{HasHeaders, NoHeaders}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticTable, SyntaxException}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ExpressionConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ExpressionConverters.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ExpressionConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ExpressionConverters.scala
index 89725ee921760..0124e6e7ef7f8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/ExpressionConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/ExpressionConverters.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.{LabelPredicateNormalizer, MatchPredicateNormalizerChain, PropertyPredicateNormalizer, addUniquenessPredicates}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternLength, SimplePatternLength, VarPatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{Predicate, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, topDown}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.{LabelPredicateNormalizer, MatchPredicateNormalizerChain, PropertyPredicateNormalizer, addUniquenessPredicates}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternLength, SimplePatternLength, VarPatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{Predicate, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, topDown}
 
 object ExpressionConverters {
   val normalizer = MatchPredicateNormalizerChain(PropertyPredicateNormalizer, LabelPredicateNormalizer)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternConverters.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternConverters.scala
index d7e4bc7bacf22..0af71b6710cdc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternConverters.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, ShortestPathPattern}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, ShortestPathPattern}
 
 object PatternConverters {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PlannerQueryBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PlannerQueryBuilder.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PlannerQueryBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PlannerQueryBuilder.scala
index 4702c4e458286..3cda166a9a1fd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PlannerQueryBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PlannerQueryBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class PlannerQueryBuilder(private val q: PlannerQuery, semanticTable: SemanticTable, returns: Seq[IdName] = Seq.empty)
   extends CollectionSupport {
@@ -85,7 +85,7 @@ case class PlannerQueryBuilder(private val q: PlannerQuery, semanticTable: Seman
     }
 
     def groupInequalities(plannerQuery: PlannerQuery): PlannerQuery = {
-      import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList._
+      import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList._
 
       plannerQuery
         .amendQueryGraph(_.mapSelections {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConverters.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConverters.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConverters.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConverters.scala
index 66069fef5e1ac..f81a35335f5dc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConverters.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConverters.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ClauseConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, Foldable, ast}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ClauseConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, Foldable, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 object StatementConverters {
   import Foldable._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/groupInequalityPredicates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/groupInequalityPredicates.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/groupInequalityPredicates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/groupInequalityPredicates.scala
index bbf22b641b98c..01d478252d30f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/groupInequalityPredicates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/groupInequalityPredicates.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AndedPropertyInequalities, Variable, InequalityExpression, Property}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.compiler.v3_0.planner.Predicate
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AndedPropertyInequalities, Variable, InequalityExpression, Property}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.compiler.v3_1.planner.Predicate
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList._
 
 // This transforms
 //
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/package.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/package.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/package.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/package.scala
index c2185970e9a3d..b22d164711807 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/package.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/package.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 package object ast {
   type QueryTagger[-T] = T => Set[QueryTag]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizer.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizer.scala
index 0a332510e85a5..5bc2e0b83e2c4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizer.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp, inSequence}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp, inSequence}
 
 case class CNFNormalizer()(implicit monitor: AstRewritingMonitor) extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContext.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContext.scala
index d236d1d7df34c..b800f60f385e0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContext.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.InliningContext._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, TypedRewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.InliningContext._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, TypedRewriter, bottomUp}
 
 case class InliningContext(projections: Map[Variable, Expression] = Map.empty,
                            seenVariables: Set[Variable] = Set.empty,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalization.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalization.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalization.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalization.scala
index 43b3971d39986..86009099018fa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalization.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalization.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 class MatchPredicateNormalization(normalizer: MatchPredicateNormalizer) extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizer.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizer.scala
index af6e936eb9c20..eebaee5e68e39 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizer.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{FreshIdNameGenerator, PartialFunctionSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{FreshIdNameGenerator, PartialFunctionSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 trait MatchPredicateNormalizer {
   val extract: PartialFunction[AnyRef, Vector[Expression]]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/Namespacer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/Namespacer.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/Namespacer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/Namespacer.scala
index 5ce6d5b24debf..414bd61d5720b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/Namespacer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/Namespacer.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.Namespacer.VariableRenamings
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Ref, Rewriter, SemanticTable, bottomUp, _}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.Namespacer.VariableRenamings
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Ref, Rewriter, SemanticTable, bottomUp, _}
 
 object Namespacer {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitter.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitter.scala
index c7c5ae890e95d..ae904e7e80e11 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitter.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 object PredicateSplitter {
   val empty = PredicateSplitter(Map.empty)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/addUniquenessPredicates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/addUniquenessPredicates.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/addUniquenessPredicates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/addUniquenessPredicates.scala
index 24f33303d39d0..017002ea811cb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/addUniquenessPredicates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/addUniquenessPredicates.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 case object addUniquenessPredicates extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/collapseInCollections.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/collapseInCollections.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/collapseInCollections.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/collapseInCollections.scala
index b366790b83a65..2fa0995c9f715 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/collapseInCollections.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/collapseInCollections.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 import scala.collection.immutable.Iterable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/copyVariables.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/copyVariables.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/copyVariables.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/copyVariables.scala
index 780ffde4e5ddf..7d5e330885e76 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/copyVariables.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/copyVariables.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object copyVariables extends Rewriter {
   private val instance = bottomUp(Rewriter.lift { case variable: Variable => variable.copyId })
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/expandStar.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/expandStar.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/expandStar.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/expandStar.scala
index 8ff058e7b2436..31b02de986592 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/expandStar.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/expandStar.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, SemanticState, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, SemanticState, bottomUp}
 
 case class expandStar(state: SemanticState) extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/foldConstants.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/foldConstants.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/foldConstants.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/foldConstants.scala
index cfe66d0186d5a..f80c0de14efb2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/foldConstants.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/foldConstants.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object foldConstants extends Rewriter {
   def apply(that: AnyRef): AnyRef =
   try {
     instance.apply(that)
   } catch {
-    case e: java.lang.ArithmeticException => throw new v3_0.ArithmeticException(e.getMessage, e)
+    case e: java.lang.ArithmeticException => throw new v3_1.ArithmeticException(e.getMessage, e)
   }
   private val instance: Rewriter = bottomUp(Rewriter.lift {
     case e@Add(lhs: SignedIntegerLiteral, rhs: SignedIntegerLiteral) =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inlineProjections.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inlineProjections.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inlineProjections.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inlineProjections.scala
index 85409ec0d193c..58651606a0ff8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inlineProjections.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inlineProjections.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.{topDown, Rewriter, TypedRewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.{topDown, Rewriter, TypedRewriter}
 
 case object inlineProjections extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inliningContextCreator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inliningContextCreator.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inliningContextCreator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inliningContextCreator.scala
index 26c0c69b15023..cd8366a55c8bf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/inliningContextCreator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/inliningContextCreator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 object inliningContextCreator extends (ast.Statement => InliningContext) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/isolateAggregation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/isolateAggregation.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/isolateAggregation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/isolateAggregation.scala
index d548611010e63..725d0e769b2df 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/isolateAggregation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/isolateAggregation.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.AggregationNameGenerator
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.{bottomUp, Rewriter, topDown}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.AggregationNameGenerator
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.{bottomUp, Rewriter, topDown}
 
 /**
  * This rewriter makes sure that aggregations are on their own in RETURN/WITH clauses, so
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/literalReplacement.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/literalReplacement.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/literalReplacement.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/literalReplacement.scala
index 5590cc0154678..f363852406a7e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/literalReplacement.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/literalReplacement.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{IdentityMap, Rewriter, ast, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{IdentityMap, Rewriter, ast, bottomUp}
 
 object literalReplacement {
   type LiteralReplacements = IdentityMap[Literal, Parameter]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/nameMatchPatternElements.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/nameMatchPatternElements.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/nameMatchPatternElements.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/nameMatchPatternElements.scala
index ee34b74bc505b..2f0ca5d7b4b60 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/nameMatchPatternElements.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/nameMatchPatternElements.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{bottomUp, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{bottomUp, Rewriter}
 
 case object nameMatchPatternElements extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/namePatternElements.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/namePatternElements.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/namePatternElements.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/namePatternElements.scala
index 509de8d6c0a0f..1dcd214a68e3e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/namePatternElements.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/namePatternElements.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.PatternExpressionPatternElementNamer
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.PatternExpressionPatternElementNamer
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object nameAllPatternElements extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeArgumentOrder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeArgumentOrder.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeArgumentOrder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeArgumentOrder.scala
index 2303ebfc8359c..961514318ddd9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeArgumentOrder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeArgumentOrder.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, topDown}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, topDown}
 
 // TODO: Support n.prop <op> m.prop, perhaps by
 //  either killing this and just looking on both lhs and rhs all over the place or
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeComparisons.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeComparisons.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeComparisons.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeComparisons.scala
index 73d171fe25944..4a41f7a72d246 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeComparisons.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeComparisons.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, NotEquals, LessThan, _}
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, topDown}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, NotEquals, LessThan, _}
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, topDown}
 
 case object normalizeComparisons extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeMatchPredicates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeMatchPredicates.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeMatchPredicates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeMatchPredicates.scala
index c7facb93eb581..9820577da700b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeMatchPredicates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeMatchPredicates.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
 case object normalizeMatchPredicates
   extends MatchPredicateNormalization(MatchPredicateNormalizerChain(PropertyPredicateNormalizer, LabelPredicateNormalizer))
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeNotEquals.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeNotEquals.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeNotEquals.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeNotEquals.scala
index 6f7ef45ecd3fb..3b62659fd13a2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeNotEquals.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeNotEquals.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.{topDown, Rewriter}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Not, Equals, NotEquals}
+import org.neo4j.cypher.internal.frontend.v3_1.{topDown, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Not, Equals, NotEquals}
 
 case object normalizeNotEquals extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeReturnClauses.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeReturnClauses.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeReturnClauses.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeReturnClauses.scala
index a53d2223f1b63..b3d400298e49d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeReturnClauses.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeReturnClauses.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.FreshIdNameGenerator
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.FreshIdNameGenerator
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 /**
  * This rewriter makes sure that all return items in a RETURN clauses are aliased, and moves
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeSargablePredicates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeSargablePredicates.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeSargablePredicates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeSargablePredicates.scala
index 1d99ba73f728d..7bb4a72923467 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeSargablePredicates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeSargablePredicates.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.{topDown, Rewriter}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions.Exists
+import org.neo4j.cypher.internal.frontend.v3_1.{topDown, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions.Exists
 
 case object normalizeSargablePredicates extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeWithClauses.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeWithClauses.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeWithClauses.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeWithClauses.scala
index 702e9ba4b5c42..a3170afb2e59f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/normalizeWithClauses.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/normalizeWithClauses.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.FreshIdNameGenerator
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.FreshIdNameGenerator
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 /**
  * This rewriter normalizes the scoping structure of a query, ensuring it is able to
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectFreshSortExpressions.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectFreshSortExpressions.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectFreshSortExpressions.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectFreshSortExpressions.scala
index feaf4dc15a8ac..b6111b5eabc2a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectFreshSortExpressions.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectFreshSortExpressions.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 /**
  * This rewriter ensures that WITH clauses containing a ORDER BY or WHERE are split, such that the ORDER BY or WHERE does not
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectNamedPaths.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectNamedPaths.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectNamedPaths.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectNamedPaths.scala
index 288e73a365e85..32fb163d9cff8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/projectNamedPaths.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/projectNamedPaths.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Ref, Rewriter, topDown}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Ref, Rewriter, topDown}
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/reattachAliasedExpressions.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/reattachAliasedExpressions.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/reattachAliasedExpressions.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/reattachAliasedExpressions.scala
index d85f6de033d15..26665f9fa0c49 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/reattachAliasedExpressions.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/reattachAliasedExpressions.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.{bottomUp, Rewriter}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Return
+import org.neo4j.cypher.internal.frontend.v3_1.{bottomUp, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Return
 
 case object reattachAliasedExpressions extends Rewriter {
   override def apply(in: AnyRef): AnyRef = findingRewriter.apply(in)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala
index 95ec7052f64cb..104efeb2b3444 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/replaceLiteralDynamicPropertyLookups.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Property, PropertyKeyName}
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Property, PropertyKeyName}
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object replaceLiteralDynamicPropertyLookups extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/rewriteEqualityToInCollection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/rewriteEqualityToInCollection.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/rewriteEqualityToInCollection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/rewriteEqualityToInCollection.scala
index ce8e27a098736..1c077c64dc37a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/rewriteEqualityToInCollection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/rewriteEqualityToInCollection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 /*
 This class rewrites equality predicates into IN comparisons which can then be turned into
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenContext.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenContext.scala
index 729a1104783ad..c80c1853668eb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenContext.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.JoinData
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.JoinData
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenPlan.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenPlan.scala
index bf125bc8dd3ca..5002e27efc9fa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenPlan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 trait CodeGenPlan {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenerator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenerator.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenerator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenerator.scala
index b540fda9aab71..a1388f62587bf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGenerator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGenerator.scala
@@ -17,24 +17,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
 import java.lang.Boolean.getBoolean
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.CodeGenerator.SourceSink
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{CompiledPlan, PlanFingerprint, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.SourceCode
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlan2PlanDescription, LogicalPlanIdentificationBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InstrumentedGraphStatistics, PlanContext, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, PlannerName, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.CodeGenerator.SourceSink
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{CompiledPlan, PlanFingerprint, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.SourceCode
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlan2PlanDescription, LogicalPlanIdentificationBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InstrumentedGraphStatistics, PlanContext, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, PlannerName, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 import org.neo4j.helpers.Clock
 
 class CodeGenerator(val structure: CodeStructure[GeneratedQuery]) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeStructure.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeStructure.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeStructure.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeStructure.scala
index 65a60507f59e5..1da5476b0d55d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeStructure.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeStructure.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 /**
  * This constitutes the SPI for code generation.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/LogicalPlanConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/LogicalPlanConverter.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/LogicalPlanConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/LogicalPlanConverter.scala
index d2ce9c69784e8..7877f52173ba9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/LogicalPlanConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/LogicalPlanConverter.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
-
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir._
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, ast, symbols}
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
+
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, ast, symbols}
 
 object LogicalPlanConverter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/Namer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/Namer.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/Namer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/Namer.scala
index 4246a2af0bc9f..d2714d28be2b4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/Namer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/Namer.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
 import java.util.concurrent.atomic.AtomicInteger
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionEvent.java b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionEvent.java
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionEvent.java
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionEvent.java
index 51430e9c10b4d..18e201cac30f7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/QueryExecutionEvent.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/QueryExecutionEvent.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen;
+package org.neo4j.cypher.internal.compiler.v3_1.codegen;
 
 public interface QueryExecutionEvent extends AutoCloseable
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/AcceptVisitor.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/AcceptVisitor.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/AcceptVisitor.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/AcceptVisitor.scala
index ae771c020b19a..1b735b3bf825d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/AcceptVisitor.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/AcceptVisitor.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class AcceptVisitor(produceResultOpName: String, columns: Map[String, CodeGenExpression])
   extends Instruction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTable.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTable.scala
index 24d4ad82dc301..c0c855dca4563 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTable.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen._
 
 sealed trait BuildProbeTable extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CartesianProductInstruction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CartesianProductInstruction.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CartesianProductInstruction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CartesianProductInstruction.scala
index 7453ebb0b1b7f..8d0fca4296a0d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CartesianProductInstruction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CartesianProductInstruction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class CartesianProductInstruction(id: String, instruction: Instruction) extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CheckingInstruction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CheckingInstruction.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CheckingInstruction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CheckingInstruction.scala
index e2a8c67cf9037..6ea49d4478a05 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CheckingInstruction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CheckingInstruction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 /**
  * Generates instruction for for updating a provided flag before creating the inner instruction
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/DecreaseAndReturnWhenZero.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/DecreaseAndReturnWhenZero.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/DecreaseAndReturnWhenZero.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/DecreaseAndReturnWhenZero.scala
index bc8c5e946554d..3f474dadb6789 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/DecreaseAndReturnWhenZero.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/DecreaseAndReturnWhenZero.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class DecreaseAndReturnWhenZero(opName: String, variableName: String, action: Instruction, startValue: CodeGenExpression)
   extends Instruction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandAllLoopDataGenerator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandAllLoopDataGenerator.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandAllLoopDataGenerator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandAllLoopDataGenerator.scala
index fdd69b616f529..9b0ba2b303eec 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandAllLoopDataGenerator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandAllLoopDataGenerator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 case class ExpandAllLoopDataGenerator(opName: String, fromVar: Variable, dir: SemanticDirection,
                    types: Map[String, String], toVar: Variable, relVar: Variable)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandIntoLoopDataGenerator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandIntoLoopDataGenerator.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandIntoLoopDataGenerator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandIntoLoopDataGenerator.scala
index 33ffc7d245bf6..a5fb1d53115de 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ExpandIntoLoopDataGenerator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ExpandIntoLoopDataGenerator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 case class ExpandIntoLoopDataGenerator(opName: String, fromVar: Variable, dir: SemanticDirection,
                    types: Map[String, String], toVar: Variable, relVar: Variable)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ForEachExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ForEachExpression.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ForEachExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ForEachExpression.scala
index deab307e74689..85975f3d843a0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ForEachExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ForEachExpression.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 case class ForEachExpression(varName: Variable, expression: CodeGenExpression, body: Instruction) extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/GetMatchesFromProbeTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/GetMatchesFromProbeTable.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/GetMatchesFromProbeTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/GetMatchesFromProbeTable.scala
index a30101d6ea8a7..5cf6e54843c89 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/GetMatchesFromProbeTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/GetMatchesFromProbeTable.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 case class GetMatchesFromProbeTable(keys: Set[Variable], code: JoinData, action: Instruction) extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/If.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/If.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/If.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/If.scala
index 3418a5c8f9b6f..22122b351f8c2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/If.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/If.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class If(predicate: CodeGenExpression, block: Instruction) extends Instruction {
   override protected def children: Seq[Instruction] = Seq(block)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexSeek.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexSeek.scala
index b1583c78c47ff..0778a28919877 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexSeek.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 case class IndexSeek(opName: String, labelName: String, propName: String, descriptorVar: String,
                      expression: CodeGenExpression) extends LoopDataGenerator {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexUniqueSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexUniqueSeek.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexUniqueSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexUniqueSeek.scala
index acf4d1c12fd65..b7569d7455a3b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/IndexUniqueSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/IndexUniqueSeek.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
 
 case class IndexUniqueSeek(opName: String, labelName: String, propName: String, descriptorVar: String,
                      expression: CodeGenExpression, node: Variable, inner: Instruction) extends Instruction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Instruction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Instruction.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Instruction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Instruction.scala
index 063080b9d8f19..e58d62c512312 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Instruction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Instruction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 trait Instruction {
   def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext): Unit = children.foreach(_.init(generator))
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/LoopDataGenerator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/LoopDataGenerator.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/LoopDataGenerator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/LoopDataGenerator.scala
index 4c8bf02b29f5b..d9bfd3b1b3e06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/LoopDataGenerator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/LoopDataGenerator.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 // Generates the code that moves data into local variables from the iterator being consumed
 trait LoopDataGenerator {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/MethodInvocation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/MethodInvocation.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/MethodInvocation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/MethodInvocation.scala
index d498f3f515022..5cb6c4f6a709c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/MethodInvocation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/MethodInvocation.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen._
 
 case class MethodInvocation(override val operatorId: Set[String],
                             symbol:JoinTableMethod,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/NullingInstruction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/NullingInstruction.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/NullingInstruction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/NullingInstruction.scala
index 978b9aa2bcd82..08a7eacc38e74 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/NullingInstruction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/NullingInstruction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
 
 /**
  * Generates code that runs and afterwards checks if the provided variable has been set,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Projection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Projection.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Projection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Projection.scala
index 5667c3cf8c610..243c70e66b54f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/Projection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/Projection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
 
 case class Projection(projectionOpName: String, variables: Map[Variable, CodeGenExpression], action: Instruction)
   extends Instruction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanAllNodes.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanAllNodes.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanAllNodes.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanAllNodes.scala
index 533483e3c7768..abe524359ed97 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanAllNodes.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanAllNodes.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 case class ScanAllNodes(opName: String) extends LoopDataGenerator {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanForLabel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanForLabel.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanForLabel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanForLabel.scala
index 32663dd08a01b..91e4b55b39f1f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/ScanForLabel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/ScanForLabel.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 case class ScanForLabel(opName: String, labelName: String, labelVar: String) extends LoopDataGenerator {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/SelectionInstruction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/SelectionInstruction.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/SelectionInstruction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/SelectionInstruction.scala
index f1eccd839b020..18ece0b8fd3e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/SelectionInstruction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/SelectionInstruction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class SelectionInstruction(id: String, instruction: Instruction) extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/WhileLoop.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/WhileLoop.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/WhileLoop.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/WhileLoop.scala
index 0670cf731bceb..0b11fe8ddf694 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/WhileLoop.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/WhileLoop.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
 
 case class WhileLoop(variable: Variable, producer: LoopDataGenerator, action: Instruction) extends Instruction {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Addition.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Addition.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Addition.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Addition.scala
index c0518aa06bfaa..cab9a205929da 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Addition.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Addition.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Addition(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression with BinaryOperator {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/BinaryOperator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/BinaryOperator.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/BinaryOperator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/BinaryOperator.scala
index 068046d7d9da4..507163f116f84 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/BinaryOperator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/BinaryOperator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 trait BinaryOperator {
   self: CodeGenExpression =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CastToCollection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CastToCollection.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CastToCollection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CastToCollection.scala
index b79f620c5a554..556eab4a8389c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CastToCollection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CastToCollection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class CastToCollection(expression: CodeGenExpression) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpression.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpression.scala
index 81f912b275fbf..9bda2123932a6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 trait CodeGenExpression {
   def init[E](generator: MethodStructure[E])(implicit context: CodeGenContext): Unit
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Collection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Collection.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Collection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Collection.scala
index 633098fed5f1b..fd78457311947 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Collection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Collection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Collection(expressions: Seq[CodeGenExpression]) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Division.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Division.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Division.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Division.scala
index 6f0599f8471c2..545178f1caab0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Division.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Division.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class Division(lhs: CodeGenExpression, rhs: CodeGenExpression)
   extends CodeGenExpression with BinaryOperator with NumericalOpType {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Equals.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Equals.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Equals.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Equals.scala
index ea76fead45417..3c0e7ae141d5e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Equals.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Equals.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.{IncomparableValuesException, symbols}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.{IncomparableValuesException, symbols}
 
 case class Equals(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ExpressionConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ExpressionConverter.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ExpressionConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ExpressionConverter.scala
index f37f21c96f099..66dbac692d50f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ExpressionConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ExpressionConverter.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.functions.functionConverter
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CTNode, CTRelationship}
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, ast, symbols}
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.functions.functionConverter
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CTNode, CTRelationship}
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, ast, symbols}
 
 object ExpressionConverter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/HasLabel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/HasLabel.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/HasLabel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/HasLabel.scala
index aee8394503af6..46288fd8ccf84 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/HasLabel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/HasLabel.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
 
 case class HasLabel(nodeVariable: Variable, labelVariable: String, labelName: String)
   extends CodeGenExpression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Literal.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Literal.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Literal.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Literal.scala
index b5f3a5b33e76e..8c52ae215b8e7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Literal.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Literal.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.LiteralTypeSupport
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.LiteralTypeSupport
 
 case class Literal(value: Object) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/LoadVariable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/LoadVariable.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/LoadVariable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/LoadVariable.scala
index 206c9f9d3d6c6..0ef02eab13a24 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/LoadVariable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/LoadVariable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 case class LoadVariable(variable: Variable) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Modulo.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Modulo.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Modulo.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Modulo.scala
index 6258ddf6929ef..707e7dcdc90ad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Modulo.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Modulo.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Modulo(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression with BinaryOperator {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Multiplication.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Multiplication.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Multiplication.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Multiplication.scala
index a9daa8d405bb2..6d5105ce3b754 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Multiplication.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Multiplication.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class Multiplication(lhs: CodeGenExpression, rhs: CodeGenExpression)
   extends CodeGenExpression with BinaryOperator with NumericalOpType {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/MyMap.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/MyMap.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/MyMap.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/MyMap.scala
index 86b7e60968a75..6ea64f2fe8a79 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/MyMap.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/MyMap.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 //Named MyMap to avoid conflict with collection.Map which makes everything weird
 case class MyMap(instructions: Map[String, CodeGenExpression]) extends CodeGenExpression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeExpression.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeExpression.scala
index 4b1714d6fb8d0..b085008800a5b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeExpression.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class NodeExpression(nodeIdVar: Variable) extends CodeGenExpression {
   assert(nodeIdVar.cypherType == symbols.CTNode)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProjection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProjection.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProjection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProjection.scala
index 904e63f00e38e..d7436589ffa56 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProjection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProjection.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class NodeProjection(nodeIdVar: Variable) extends CodeGenExpression {
   assert(nodeIdVar.cypherType == symbols.CTNode)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProperty.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProperty.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProperty.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProperty.scala
index fa554ee0ef74b..0fc2c5e840535 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/NodeProperty.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/NodeProperty.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 abstract class ElementProperty(token: Option[Int], propName: String, elementIdVar: String, propKeyVar: String)
   extends CodeGenExpression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Not.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Not.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Not.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Not.scala
index b0467e2ca5332..9727344f04cb4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Not.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Not.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 case class Not(inner: CodeGenExpression) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Or.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Or.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Or.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Or.scala
index f6cf355f44611..84090e647f6c6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Or.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Or.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 case class Or(lhs: CodeGenExpression, rhs: CodeGenExpression) extends CodeGenExpression with BinaryOperator {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Parameter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Parameter.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Parameter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Parameter.scala
index ee3cbbf4bf6d5..ef98c560e6a97 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Parameter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Parameter.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Parameter(key: String, variableName: String) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipExpression.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipExpression.scala
index fe6e8ecaa16b4..97ec9d2250d2a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipExpression.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class RelationshipExpression(relId: Variable) extends CodeGenExpression {
   assert(relId.cypherType == symbols.CTRelationship)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipProjection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipProjection.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipProjection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipProjection.scala
index 79fc2c7922a38..ec0b7a9f81798 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/RelationshipProjection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/RelationshipProjection.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class RelationshipProjection(relId: Variable) extends CodeGenExpression {
   assert(relId.cypherType == symbols.CTRelationship)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Subtraction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Subtraction.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Subtraction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Subtraction.scala
index 3ddc49e85e60f..e8aed9cb9207d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/Subtraction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/Subtraction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
 
 case class Subtraction(lhs: CodeGenExpression, rhs: CodeGenExpression)
   extends CodeGenExpression with BinaryOperator with NumericalOpType {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ToSet.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ToSet.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ToSet.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ToSet.scala
index 46ecd99b5ba67..82395a039baa9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/ToSet.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/ToSet.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ToSet(expression: CodeGenExpression) extends CodeGenExpression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/TypeOf.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/TypeOf.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/TypeOf.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/TypeOf.scala
index 9e1bcbb49230d..03431644ea02f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/TypeOf.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/TypeOf.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{CodeGenContext, MethodStructure, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, MethodStructure, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
 
 case class TypeOf(relId: Variable)
   extends CodeGenExpression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/CodeGenFunction1.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/CodeGenFunction1.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/CodeGenFunction1.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/CodeGenFunction1.scala
index 5ce4786274185..6ec2cd6579cae 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/CodeGenFunction1.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/CodeGenFunction1.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.functions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.functions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions._
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions._
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 sealed trait CodeGenFunction1 extends ((CodeGenExpression) => CodeGenExpression)
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/functionConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/functionConverter.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/functionConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/functionConverter.scala
index 3336de2283818..9f0c5a90aa46c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/functions/functionConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/functions/functionConverter.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.functions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.functions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.frontend.v3_0.ast
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.frontend.v3_1.ast
 
 object functionConverter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/setStaticField.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/setStaticField.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/setStaticField.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/setStaticField.scala
index 128d050965588..603c8e26cb359 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/setStaticField.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/setStaticField.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
 object setStaticField {
   def apply(clazz: Class[_], name: String, value: AnyRef) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AstNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AstNode.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AstNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AstNode.scala
index 14ad8676e3d45..80f9efe836cdd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AstNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AstNode.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAst.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAst.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAst.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAst.scala
index 348804a95c9de..cb7389d251698 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAst.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAst.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
-import org.neo4j.cypher.internal.frontend.v3_0.PatternException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
+import org.neo4j.cypher.internal.frontend.v3_1.PatternException
 
 case class CreateUniqueAst(patterns: Seq[AbstractPattern]) {
   def nextStep(): (Seq[CreateUniqueStartItem], Seq[NamedPath]) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/EntityProducerFactory.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/EntityProducerFactory.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/EntityProducerFactory.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/EntityProducerFactory.scala
index 1ba02db7a08c8..e15eda8e2d081 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/EntityProducerFactory.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/EntityProducerFactory.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.GetGraphElements
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{makeValueNeoSafe, GraphElementPropertyFunctions}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{NodeByLabelEntityProducer, EntityProducer, IndexSeekModeFactory, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.{EntityNotFoundException, IndexHintException, InternalException}
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.GetGraphElements
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{makeValueNeoSafe, GraphElementPropertyFunctions}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{NodeByLabelEntityProducer, EntityProducer, IndexSeekModeFactory, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.{EntityNotFoundException, IndexHintException, InternalException}
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 class EntityProducerFactory extends GraphElementPropertyFunctions {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/InCollection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/InCollection.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/InCollection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/InCollection.scala
index 58619920d4a37..d42a58de2ed91 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/InCollection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/InCollection.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import expressions.{Closure, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 import pipes.QueryState
 import collection.Seq
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/IndexOperation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/IndexOperation.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/IndexOperation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/IndexOperation.scala
index be26b72c23b33..fc0c0c5893957 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/IndexOperation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/IndexOperation.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 sealed abstract class IndexOperation extends AbstractQuery {
   val label: String
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LabelAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LabelAction.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LabelAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LabelAction.scala
index c480c272a3e38..9a7f2901e8b50 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LabelAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LabelAction.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{SetLabel, Effect, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.SetAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{SetLabel, Effect, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.SetAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import org.neo4j.graphdb.Node
 
 sealed abstract class LabelOp
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAst.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAst.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAst.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAst.scala
index 83682a6edcd14..bdb424ab2ebc3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAst.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAst.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{SetAction, MergeNodeAction, MergePatternAction, PropertySetAction, UpdateAction}
-import org.neo4j.cypher.internal.frontend.v3_0.PatternException
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{SetAction, MergeNodeAction, MergePatternAction, PropertySetAction, UpdateAction}
+import org.neo4j.cypher.internal.frontend.v3_1.PatternException
 
 case class MergeAst(patterns: Seq[AbstractPattern],
                     onActions: Seq[OnAction],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/NamedPath.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/NamedPath.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/NamedPath.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/NamedPath.scala
index ca3b48dace70e..ab4ade52f9a1c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/NamedPath.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/NamedPath.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 import expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.AbstractPattern
+import org.neo4j.cypher.internal.compiler.v3_1.AbstractPattern
 
 case class NamedPath(pathName: String, pathPattern: AbstractPattern*) extends Traversable[AbstractPattern]  {
   def foreach[U](f: (AbstractPattern) => U) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExpression.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExpression.scala
index db3a7a6ad1291..15a5f500d9a74 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExpression.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.PatternGraphBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator.isNamed
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.MatchingContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.PatternGraphBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator.isNamed
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.MatchingContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class PathExpression(pathPattern: Seq[Pattern], predicate:Predicate=True())
   extends Expression
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExtractor.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExtractor.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExtractor.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExtractor.scala
index 94eab638a10c5..d23c628442bba 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PathExtractor.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PathExtractor.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
 import org.neo4j.graphdb.{PropertyContainer, Path}
 import scala.collection.Map
 import collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Pattern.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Pattern.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Pattern.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Pattern.scala
index 4cdddea4cc730..2ab72a926a589 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Pattern.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Pattern.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.GraphElementPropertyFunctions
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.TypeSafe
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.GraphElementPropertyFunctions
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.TypeSafe
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.collection.{Map, Seq}
 trait Pattern extends TypeSafe with AstNode[Pattern] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Query.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Query.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Query.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Query.scala
index 0b64dfcf47bb8..96c525e32faee 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Query.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Query.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{True, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{True, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
 import expressions.{Expression, AggregationExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands
+import org.neo4j.cypher.internal.compiler.v3_1.commands
 import scala.annotation.tailrec
 
 object Query {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryBuilder.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryBuilder.scala
index 1981512fa02fc..b579dfb0b680a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryBuilder.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 import expressions.{ParameterExpression, Literal, Expression, AggregationExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{True, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UpdateAction
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{True, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UpdateAction
 
 case class QueryBuilder(
   startItems: Seq[StartItem] = Seq(),
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryString.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryString.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryString.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryString.scala
index 3dbac4e01b140..eb258acd8a333 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/QueryString.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/QueryString.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 object QueryString {
   lazy val empty = QueryString("")
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReturnItem.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReturnItem.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReturnItem.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReturnItem.scala
index 4d80199180e2d..5577025ebe7bc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReturnItem.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReturnItem.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator.isNamed
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator.isNamed
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SortItem.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SortItem.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SortItem.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SortItem.scala
index 6be658716cdae..5cd826ee794f1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SortItem.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SortItem.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.PatternException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.PatternException
 
 case class SortItem(expression: Expression, ascending: Boolean) {
   def apply(ctx: ExecutionContext)(implicit qtx: QueryState) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/StartItem.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/StartItem.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/StartItem.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/StartItem.scala
index c1a530df2650e..98856e68f8870 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/StartItem.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/StartItem.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{SymbolTable, TypeSafe}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{SymbolTable, TypeSafe}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 trait NodeStartItemVariables extends StartItem {
   def variables: Seq[(String, CypherType)] = Seq(variableName -> CTNode)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Union.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Union.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Union.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Union.scala
index 49b356bc61bf9..d0e8973d2fcbd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/Union.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/Union.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 case class Union(queries: Seq[Query], queryString: QueryString = QueryString.empty, distinct: Boolean) extends AbstractQuery {
   def setQueryText(t: String): AbstractQuery = copy(queryString = QueryString(t))
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/coerce.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/coerce.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/coerce.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/coerce.scala
index e3371edaee8bf..4f4972e09c140 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/coerce.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/coerce.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Point
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsCollection, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Point
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsCollection, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Path, Relationship}
 
 object coerce {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Add.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Add.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Add.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Add.scala
index 00b811b04776f..54c8931e39530 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Add.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Add.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsCollection, TypeSafeMathSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsCollection, TypeSafeMathSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Add(a: Expression, b: Expression) extends Expression with TypeSafeMathSupport {
   def apply(ctx: ExecutionContext)(implicit state: QueryState) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/AggregationExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/AggregationExpression.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/AggregationExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/AggregationExpression.scala
index f691f4b196d36..1100944c6b9f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/AggregationExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/AggregationExpression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation._
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation._
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 abstract class AggregationExpression extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Avg.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Avg.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Avg.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Avg.scala
index d10f56b609ba8..cb5d8a96f71cd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Avg.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Avg.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import pipes.aggregation.AvgFunction
 import symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Avg(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new AvgFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Closure.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Closure.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Closure.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Closure.scala
index b7edb10f60e54..98103c4757668 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Closure.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Closure.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.TypeSafe
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.TypeSafe
 
 trait Closure {
   def symbolTableDependencies(collection:TypeSafe, closure:TypeSafe, id:String) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoalesceFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoalesceFunction.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoalesceFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoalesceFunction.scala
index 55ee6a4774aa4..079ab432c1993 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoalesceFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoalesceFunction.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class CoalesceFunction(arguments: Expression*) extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState): Any =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceTo.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceTo.scala
similarity index 77%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceTo.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceTo.scala
index 309013bcd159c..f8c425d8dd0d6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceTo.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceTo.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.coerce
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.coerce
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 
 case class CoerceTo(expr: Expression, typ: CypherType) extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collect.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collect.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collect.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collect.scala
index b3e2d7c192eee..4b942d2f55a7d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collect.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collect.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.aggregation.CollectFunction
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Collect(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new CollectFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collection.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collection.scala
index ca9db4782ef4c..2ab7598474b50 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Collection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Collection.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 object Collection {
   val empty = Literal(Seq())
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpression.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpression.scala
index 2c83de1be015c..687b58d6ebe6f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class CollectionSliceExpression(collection: Expression, from: Option[Expression], to: Option[Expression])
   extends NullInNullOutExpression(collection) with CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndex.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndex.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndex.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndex.scala
index 9efa90fba0bca..802cefd692e39 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndex.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndex.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport, IsCollection, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport, IsCollection, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ContainerIndex(expression: Expression, index: Expression) extends NullInNullOutExpression(expression)
 with CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Count.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Count.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Count.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Count.scala
index 29cb37abc2177..af80aaf27e3d1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Count.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Count.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.CountFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.CountFunction
 
 case class Count(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new CountFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CountStar.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CountStar.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CountStar.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CountStar.scala
index c5aace72d9827..135cf5fb0eccc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CountStar.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CountStar.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.CountStarFunction
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.CountStarFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class CountStar() extends AggregationExpression {
   def rewrite(f: (Expression) => Expression) = f(CountStar())
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DistanceFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DistanceFunction.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DistanceFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DistanceFunction.scala
index 7813c127acf6b..e69aea897464a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DistanceFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DistanceFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import Math._
 
 case class DistanceFunction(p1: Expression, p2: Expression) extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Distinct.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Distinct.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Distinct.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Distinct.scala
index ba7c80c7f3636..19531b1e36899 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Distinct.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Distinct.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.DistinctFunction
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.DistinctFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Distinct(innerAggregator: AggregationExpression, expression: Expression) extends AggregationWithInnerExpression(expression) {
   val expectedInnerType = CTAny
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Divide.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Divide.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Divide.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Divide.scala
index 72a879240a916..4aeb96e76afba 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Divide.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Divide.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.ArithmeticException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.ArithmeticException
 
 case class Divide(a: Expression, b: Expression) extends Arithmetics(a, b) {
   def operand = "/"
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Expression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Expression.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Expression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Expression.scala
index 4d1eac4c7f03e..1751755aa57e4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Expression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Expression.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{CoercedPredicate, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.TypeSafeMathSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{SymbolTable, TypeSafe, Typed}
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{CoercedPredicate, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.TypeSafeMathSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{SymbolTable, TypeSafe, Typed}
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
 
 abstract class Expression extends Typed with TypeSafe with EffectfulAstNode[Expression] {
   def rewrite(f: Expression => Expression): Expression
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunction.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunction.scala
index dd8b638fdfce0..3c82684c9a9a6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ExtractFunction(collection: Expression, id: String, expression: Expression)
   extends NullInNullOutExpression(collection)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FilterFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FilterFunction.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FilterFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FilterFunction.scala
index 7940c173772ff..233e52cfeed44 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FilterFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FilterFunction.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class FilterFunction(collection: Expression, id: String, predicate: Predicate)
   extends NullInNullOutExpression(collection)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCase.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCase.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCase.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCase.scala
index 261c7a81eeb65..d4049c4c4996b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCase.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCase.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class GenericCase(alternatives: Seq[(Predicate, Expression)], default: Option[Expression]) extends Expression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GetDegree.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GetDegree.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GetDegree.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GetDegree.scala
index dac02ec44041a..d2bbebb9a9c8c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GetDegree.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GetDegree.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 case class GetDegree(node: Expression, typ: Option[KeyToken], direction: SemanticDirection) extends NullInNullOutExpression(node) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/IdFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/IdFunction.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/IdFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/IdFunction.scala
index 837bcc02f602d..3804b2dc4ae3c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/IdFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/IdFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class IdFunction(inner: Expression) extends NullInNullOutExpression(inner) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/InequalitySeekRangeExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/InequalitySeekRangeExpression.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/InequalitySeekRangeExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/InequalitySeekRangeExpression.scala
index 16c8e39b4f4bf..a51dab0e10537 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/InequalitySeekRangeExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/InequalitySeekRangeExpression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionContext, InequalitySeekRange}
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionContext, InequalitySeekRange}
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class InequalitySeekRangeExpression(range: InequalitySeekRange[Expression])
   extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunction.scala
similarity index 77%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunction.scala
index 2ef6d06ae3661..9815fd3025850 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsMap
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsMap
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class KeysFunction(expr: Expression) extends NullInNullOutExpression(expr) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunction.scala
similarity index 76%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunction.scala
index 10e770a39559c..074d8e1b1309c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 case class LabelsFunction(nodeExpr: Expression) extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LengthFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LengthFunction.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LengthFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LengthFunction.scala
index 1fbb16667dbe6..11261b1b265be 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LengthFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LengthFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Path
 
 case class LengthFunction(inner: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Literal.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Literal.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Literal.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Literal.scala
index 5304a74fc42bb..8a7df3b1a5364 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Literal.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Literal.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{LiteralTypeSupport, IsCollection, IsMap}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{LiteralTypeSupport, IsCollection, IsMap}
 
 case class Literal(v: Any) extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState): Any = v
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMap.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMap.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMap.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMap.scala
index dcbc031793c34..ca68ba1b084f6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMap.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMap.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import mutation.GraphElementPropertyFunctions
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import collection.Map
 
 case class LiteralMap(data: Map[String, Expression]) extends Expression with GraphElementPropertyFunctions {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/MathFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/MathFunction.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/MathFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/MathFunction.scala
index d795f59d3fcf0..dc85effd5c2a4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/MathFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/MathFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, InvalidArgumentException}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, InvalidArgumentException}
 
 abstract class MathFunction(arg: Expression) extends Expression with NumericHelper {
   def innerExpectedType = CTNumber
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Max.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Max.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Max.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Max.scala
index 03920ce7fe4e0..4054d8f01d278 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Max.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Max.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.aggregation.MaxFunction
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Max(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new MaxFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Min.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Min.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Min.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Min.scala
index eaa8cba43cc49..c3c06258e3d46 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Min.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Min.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.aggregation.MinFunction
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Min(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new MinFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Modulo.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Modulo.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Modulo.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Modulo.scala
index 0f1d7d183c80b..33aab7925a5f8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Modulo.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Modulo.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 case class Modulo(a: Expression, b: Expression) extends Arithmetics(a, b) {
   def calc(a: Number, b: Number) = a.doubleValue() % b.doubleValue()
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Multiply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Multiply.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Multiply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Multiply.scala
index 56ce5142a8493..3b83e2feed648 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Multiply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Multiply.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 case class Multiply(a: Expression, b: Expression) extends Arithmetics(a, b) {
   def calc(a: Number, b: Number) = multiply(a, b)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NestedPipeExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NestedPipeExpression.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NestedPipeExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NestedPipeExpression.scala
index 00c607a8d5d43..de31bb5300244 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NestedPipeExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NestedPipeExpression.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{Pipe, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{Pipe, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class NestedPipeExpression(pipe: Pipe, path: ProjectedPath) extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState): Any = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NodesFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NodesFunction.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NodesFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NodesFunction.scala
index 142765d2eff20..0837affb5ae65 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NodesFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NodesFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Path
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Null.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Null.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Null.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Null.scala
index 28b43480de1ff..8932f34dcd48b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Null.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Null.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Null() extends Expression {
   def apply(v1: ExecutionContext)(implicit state: QueryState) = null
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NullInNullOutExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NullInNullOutExpression.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NullInNullOutExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NullInNullOutExpression.scala
index b3dbb1140e1ed..f1ad91a35929c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/NullInNullOutExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/NullInNullOutExpression.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import pipes.QueryState
 
 abstract class NullInNullOutExpression(argument: Expression) extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ParameterExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ParameterExpression.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ParameterExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ParameterExpression.scala
index d56fc4593ec23..a7563dd92b6a9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ParameterExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ParameterExpression.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ParameterExpression(parameterName: String) extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState) = state.getParam(parameterName)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImpl.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImpl.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImpl.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImpl.scala
index 607ca9623df5f..f520adf219184 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImpl.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImpl.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import java.lang.{Iterable => JavaIterable}
 import java.util.{Iterator => JavaIterator}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilder.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilder.scala
index cf677a22cebe9..e6f2bb8645ea1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilder.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Percentile.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Percentile.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Percentile.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Percentile.scala
index 9d1a271ee0d42..d6c73d66e6fb1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Percentile.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Percentile.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.PercentileContFunction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.PercentileDiscFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.PercentileContFunction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.PercentileDiscFunction
 
 case class PercentileCont(anInner: Expression, percentile: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new PercentileContFunction(anInner, percentile)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PointFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PointFunction.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PointFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PointFunction.scala
index a383623bc661c..c116acd55973a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PointFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PointFunction.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsMap
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsMap
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class PointFunction(data: Expression) extends NullInNullOutExpression(data) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Pow.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Pow.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Pow.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Pow.scala
index bc589384a8d95..b6b4179cf2f48 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Pow.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Pow.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 case class Pow(a: Expression, b: Expression) extends Arithmetics(a, b) {
   def calc(a: Number, b: Number) = math.pow(a.doubleValue(), b.doubleValue())
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PrefixSeekRangeExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PrefixSeekRangeExpression.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PrefixSeekRangeExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PrefixSeekRangeExpression.scala
index 8623e9aa7f304..32e52543ee86d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PrefixSeekRangeExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PrefixSeekRangeExpression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionContext, PrefixRange}
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionContext, PrefixRange}
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class PrefixSeekRangeExpression(range: PrefixRange[Expression]) extends Expression {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ProjectedPath.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ProjectedPath.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ProjectedPath.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ProjectedPath.scala
index f86bf16daa3fb..b07480884fc9f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ProjectedPath.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ProjectedPath.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Relationship}
 
 object ProjectedPath {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunction.scala
similarity index 77%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunction.scala
index 49a8f828de3a9..2893593e7f217 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunction.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsMap
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsMap
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class PropertiesFunction(a: Expression) extends NullInNullOutExpression(a) {
   override def compute(value: Any, m: ExecutionContext)(implicit state: QueryState) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Property.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Property.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Property.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Property.scala
index 1951df1196899..ceba8776f9a2a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Property.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Property.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsMap
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, EntityNotFoundException}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsMap
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, EntityNotFoundException}
 import org.neo4j.graphdb.{Node, NotFoundException, Relationship}
 
 case class Property(mapExpr: Expression, propertyKey: KeyToken)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ReduceFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ReduceFunction.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ReduceFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ReduceFunction.scala
index 0b1ddd04c9ada..3df15e69493d8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ReduceFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ReduceFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ReduceFunction(collection: Expression, id: String, expression: Expression, acc:String, init:Expression )
   extends NullInNullOutExpression(collection) with CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipEndPoints.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipEndPoints.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipEndPoints.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipEndPoints.scala
index 7dc30d13e781f..920a027c226f1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipEndPoints.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipEndPoints.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CastSupport.castOrFail
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CastSupport.castOrFail
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Relationship
 
 case class RelationshipEndPoints(relExpression: Expression, start: Boolean) extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipFunction.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipFunction.scala
index 6fdc302f3fd80..e89c49e57b639 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Path
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunction.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunction.scala
index 38300db4ab367..6bc82aad1d6df 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CastSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, EntityNotFoundException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CastSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, EntityNotFoundException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Relationship
 
 case class RelationshipTypeFunction(relationship: Expression) extends NullInNullOutExpression(relationship) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathExpression.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathExpression.scala
index e1f0f39d5084f..e725d5d13eb37 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathExpression.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{PathExtractor, Pattern, ShortestPath, SingleNode, _}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{PathExtractor, Pattern, ShortestPath, SingleNode, _}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Path, PropertyContainer}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathSPI.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathSPI.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathSPI.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathSPI.scala
index a68a84d8868c8..589ee707b2ed7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathSPI.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ShortestPathSPI.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Path, Node, PropertyContainer}
 
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCase.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCase.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCase.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCase.scala
index 633e55dea314c..16f0d7c5d2410 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCase.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCase.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class SimpleCase(expression: Expression, alternatives: Seq[(Expression, Expression)], default: Option[Expression])
   extends Expression {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SizeFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SizeFunction.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SizeFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SizeFunction.scala
index fd11a37962863..b6d167b989b93 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SizeFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SizeFunction.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Path
 
 case class SizeFunction(inner: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Stdev.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Stdev.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Stdev.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Stdev.scala
index 4d4e38481cdc2..7e85c823c65e1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Stdev.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Stdev.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.StdevFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.StdevFunction
 
 case class Stdev(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new StdevFunction(anInner, false)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctions.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctions.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctions.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctions.scala
index 6dd8887e2a634..3499fd5c5bb68 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctions.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctions.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{ParameterWrongTypeException, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{ParameterWrongTypeException, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Subtract.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Subtract.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Subtract.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Subtract.scala
index a6edb4e79e82d..7763e34770968 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Subtract.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Subtract.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 case class Subtract(a: Expression, b: Expression) extends Arithmetics(a, b) {
   def calc(a: Number, b: Number) = minus(a, b)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Sum.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Sum.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Sum.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Sum.scala
index 151a0467e6112..5e503612ea63f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Sum.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Sum.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.SumFunction
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.SumFunction
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class Sum(anInner: Expression) extends AggregationWithInnerExpression(anInner) {
   def createAggregationFunction = new SumFunction(anInner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/TimestampFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/TimestampFunction.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/TimestampFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/TimestampFunction.scala
index c1230f48a78b4..23aaf2c85478e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/TimestampFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/TimestampFunction.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class TimestampFunction() extends Expression {
   def apply(ctx: ExecutionContext)(implicit state: QueryState):Any = state.readTimeStamp()
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunction.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunction.scala
index 6c0847234fe73..ee887a556f952 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.ParameterWrongTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.ParameterWrongTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ToFloatFunction(a: Expression) extends NullInNullOutExpression(a) {
   def symbolTableDependencies: Set[String] = a.symbolTableDependencies
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunction.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunction.scala
index 75f9f619a46a8..ca45e9f93626e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{ParameterWrongTypeException, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{ParameterWrongTypeException, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ToIntFunction(a: Expression) extends NullInNullOutExpression(a) {
   def symbolTableDependencies: Set[String] = a.symbolTableDependencies
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunction.scala
similarity index 76%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunction.scala
index a966f37650c6c..0bd053977e53c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunction.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.ParameterWrongTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.ParameterWrongTypeException
 
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Variable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Variable.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Variable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Variable.scala
index 385b45c504c31..91e93ac5cb383 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/Variable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/Variable.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{SymbolTable, Typed}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{SymbolTable, Typed}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.NotFoundException
 
 case class Variable(entityName: String) extends Expression with Typed {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/indexQuery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/indexQuery.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/indexQuery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/indexQuery.scala
index 6888106209dfa..c6ffb4a3f0a5a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/indexQuery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/indexQuery.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, InequalitySeekRangeExpression, PrefixSeekRangeExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsCollection
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, InequalitySeekRangeExpression, PrefixSeekRangeExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsCollection
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 import org.neo4j.graphdb.Node
 
 import scala.collection.GenTraversableOnce
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ands.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ands.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ands.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ands.scala
index 7497f938d7c6f..f7fffe4d46295 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ands.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ands.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.predicates
+package org.neo4j.cypher.internal.compiler.v3_1.commands.predicates
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
 
 case class Ands(predicates: NonEmptyList[Predicate]) extends CompositeBooleanPredicate {
   override def shouldExitWhen = false
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/ComparablePredicate.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/ComparablePredicate.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/ComparablePredicate.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/ComparablePredicate.scala
index 6e3640b04f6c4..744eb35a04c52 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/ComparablePredicate.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/ComparablePredicate.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.predicates
+package org.neo4j.cypher.internal.compiler.v3_1.commands.predicates
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IsCollection
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IsCollection
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException
 import org.neo4j.graphdb.{Node, Relationship}
 
 abstract sealed class ComparablePredicate(val left: Expression, val right: Expression) extends Predicate with Comparer {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ors.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ors.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ors.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ors.scala
index ea716a1bd5314..c891b8482ff06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Ors.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Ors.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.predicates
+package org.neo4j.cypher.internal.compiler.v3_1.commands.predicates
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
 
 case class Ors(predicates: NonEmptyList[Predicate]) extends CompositeBooleanPredicate {
   def shouldExitWhen = true
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Predicate.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Predicate.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Predicate.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Predicate.scala
index 2a0fa0e30debc..d0dd038b38be4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/Predicate.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/Predicate.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.predicates
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ReadsNodesWithLabels, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsMap, CastSupport, CollectionSupport, IsCollection}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.commands.predicates
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ReadsNodesWithLabels, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsMap, CastSupport, CollectionSupport, IsCollection}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import org.neo4j.graphdb._
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/groupInequalityPredicatesForLegacy.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/groupInequalityPredicatesForLegacy.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/groupInequalityPredicatesForLegacy.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/groupInequalityPredicatesForLegacy.scala
index 4dcaa26aead84..79a7d6c388912 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/predicates/groupInequalityPredicatesForLegacy.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/predicates/groupInequalityPredicatesForLegacy.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.predicates
+package org.neo4j.cypher.internal.compiler.v3_1.commands.predicates
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Property}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Property}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
 
 // This transforms
 //
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyToken.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyToken.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyToken.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyToken.scala
index 0a95519540f12..02e33d4a0b5c5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyToken.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyToken.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.values
+package org.neo4j.cypher.internal.compiler.v3_1.commands.values
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{TokenContext, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{TokenContext, QueryContext}
 
 /*
 KeyTokens are things with name and id. KeyTokens makes it possible to look up the id
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/TokenType.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/TokenType.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/TokenType.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/TokenType.scala
index 9345a741b1d01..4b46dbb3e77e6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/TokenType.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/TokenType.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.values
+package org.neo4j.cypher.internal.compiler.v3_1.commands.values
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{TokenContext, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{TokenContext, QueryContext}
 
 object TokenType extends Enumeration {
   case object Label extends TokenType {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala
index 69183470ac172..33a35a6722b24 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabel.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{MergeNodeAction, PlainMergeNodeProducer, UpdateAction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.LabelId
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{InternalNotification, LargeLabelWithLoadCsvNotification}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{MergeNodeAction, PlainMergeNodeProducer, UpdateAction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.LabelId
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{InternalNotification, LargeLabelWithLoadCsvNotification}
 
 case class CheckForLoadCsvAndMatchOnLargeLabel(planContext: PlanContext, nonIndexedLabelWarningThreshold: Long) extends (Pipe => Option[InternalNotification]) {
 
   private val threshold = Cardinality(nonIndexedLabelWarningThreshold)
 
   def apply(pipe: Pipe) = {
-    import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
+    import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
 
     sealed trait SearchState
     case object NoneFound extends SearchState
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResult.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResult.scala
index 6a404c081181f..f9ae86167c5e2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResult.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ProfilerStatisticsNotReadyException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ProfilerStatisticsNotReadyException
 
 trait SuccessfulCloseable {
   def success(): Unit
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/DefaultExecutionResultBuilderFactory.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/DefaultExecutionResultBuilderFactory.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/DefaultExecutionResultBuilderFactory.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/DefaultExecutionResultBuilderFactory.scala
index 400df756e4b66..c396246742d77 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/DefaultExecutionResultBuilderFactory.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/DefaultExecutionResultBuilderFactory.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{CSVResources, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, ExplainMode, _}
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{CSVResources, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, ExplainMode, _}
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Effects.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Effects.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Effects.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Effects.scala
index 4780d26cee866..2d15c409de0a1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Effects.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Effects.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ReturnItem, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UpdateAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.Effectful
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ReturnItem, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UpdateAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.Effectful
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Effects(effectsSet: Set[Effect] = Set.empty) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EntityAccessor.java b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EntityAccessor.java
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EntityAccessor.java
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EntityAccessor.java
index 8d62054df3ec4..9834c73a53349 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EntityAccessor.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EntityAccessor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan;
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan;
 
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ErrorReportingExecutablePlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ErrorReportingExecutablePlanBuilder.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ErrorReportingExecutablePlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ErrorReportingExecutablePlanBuilder.scala
index 21d0ce4437cfe..436d8dd0d76ed 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ErrorReportingExecutablePlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ErrorReportingExecutablePlanBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.{PreparedQuerySemantics, CompilationPhaseTracer, PreparedQuerySyntax}
-import org.neo4j.cypher.internal.frontend.v3_0.InvalidArgumentException
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.{PreparedQuerySemantics, CompilationPhaseTracer, PreparedQuerySyntax}
+import org.neo4j.cypher.internal.frontend.v3_1.InvalidArgumentException
 
 case class ErrorReportingExecutablePlanBuilder(inner: ExecutablePlanBuilder) extends ExecutablePlanBuilder {
   override def producePlan(inputQuery: PreparedQuerySemantics, planContext: PlanContext, tracer: CompilationPhaseTracer, createFingerprintReference: (Option[PlanFingerprint]) => PlanFingerprintReference) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlan.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlan.scala
index 64aa59082d092..fb756c018021b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlan.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{PlanContext, GraphStatistics, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, PlannerName, RuntimeName}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{PlanContext, GraphStatistics, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, PlannerName, RuntimeName}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 
 abstract class ExecutionPlan {
   def run(queryContext: QueryContext, planType: ExecutionMode, params: Map[String, Any]): InternalExecutionResult
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlanBuilder.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlanBuilder.scala
index a1e4f1142d443..131c782ea3e79 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionPlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionPlanBuilder.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
-
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionTracer
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.profiling.ProfilingTracer
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CantCompileQueryException, CantHandleQueryException}
-import org.neo4j.cypher.internal.compiler.v3_0.profiler.Profiler
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, ProfileMode, _}
-import org.neo4j.cypher.internal.frontend.v3_0.PeriodicCommitInOpenTransactionException
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
+
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionTracer
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling.ProfilingTracer
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CantCompileQueryException, CantHandleQueryException}
+import org.neo4j.cypher.internal.compiler.v3_1.profiler.Profiler
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, ProfileMode, _}
+import org.neo4j.cypher.internal.frontend.v3_1.PeriodicCommitInOpenTransactionException
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.helpers.Clock
 import org.neo4j.kernel.GraphDatabaseQueryService
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionResultBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionResultBuilder.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionResultBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionResultBuilder.scala
index 1ba5b33144feb..7bc4929bd1d98 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionResultBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionResultBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, InternalNotificationLogger}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, InternalNotificationLogger}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
 
 trait ExecutionResultBuilder {
   def setQueryContext(context: QueryContext)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalExecutionResult.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalExecutionResult.scala
index 9ffb76333fb7b..0bb5c21146f04 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalExecutionResult.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.io.PrintWriter
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultVisitor
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, InternalQueryStatistics}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultVisitor
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, InternalQueryStatistics}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.graphdb.ResourceIterator
 
 trait InternalExecutionResult extends Iterator[Map[String, Any]] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalQueryType.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalQueryType.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalQueryType.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalQueryType.scala
index edc1b85b994c5..706298d485596 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/InternalQueryType.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/InternalQueryType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 sealed trait InternalQueryType
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LegacyExecutablePlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LegacyExecutablePlanBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LegacyExecutablePlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LegacyExecutablePlanBuilder.scala
index a9c2fb4c722c6..6492c5e33f290 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LegacyExecutablePlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LegacyExecutablePlanBuilder.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.reattachAliasedExpressions
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.groupInequalityPredicatesForLegacy
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InterpretedExecutionPlanBuilder.interpretedToExecutionPlan
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.prepare.KeyTokenResolver
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.{DisconnectedShortestPathEndPointsBuilder, _}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.{fixedPoint, NonEmptyList}
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.reattachAliasedExpressions
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.groupInequalityPredicatesForLegacy
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InterpretedExecutionPlanBuilder.interpretedToExecutionPlan
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.prepare.KeyTokenResolver
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.{DisconnectedShortestPathEndPointsBuilder, _}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.{fixedPoint, NonEmptyList}
 
 trait ExecutionPlanInProgressRewriter {
   def rewrite(in: ExecutionPlanInProgress)(implicit context: PipeMonitor): ExecutionPlanInProgress
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIterator.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIterator.scala
index 95e0b8e1d78af..81b8e68794af6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIterator.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.net.URL
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserver.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserver.scala
index 76b44c0486c4b..16578868725e6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserver.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.ExternalCSVResource
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherException, LoadCsvStatusWrapCypherException}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.ExternalCSVResource
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherException, LoadCsvStatusWrapCypherException}
 
 class LoadCsvPeriodicCommitObserver(batchRowCount: Long, resources: ExternalCSVResource, queryContext: QueryContext)
   extends ExternalCSVResource with ((CypherException) => CypherException) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/MatchPattern.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/MatchPattern.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/MatchPattern.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/MatchPattern.scala
index b9e74cdae0f15..c72da317c755c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/MatchPattern.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/MatchPattern.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import collection.mutable
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleNode
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ShortestPath
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleNode
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ShortestPath
 
 object MatchPattern {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Namer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Namer.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Namer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Namer.scala
index 3d89d10e25ae0..1a6a56599945d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Namer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Namer.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
 import scala.util.Random
 
 trait Namer extends (Expression => String) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQuery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQuery.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQuery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQuery.scala
index cc017f843e5f5..478cf86602956 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQuery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQuery.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{AggregationExpression, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.{PatternGraphBuilder, QueryToken, Unsolved}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UpdateAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.Pipe
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{AggregationExpression, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.{PatternGraphBuilder, QueryToken, Unsolved}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UpdateAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.Pipe
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 import scala.collection.Seq
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Phase.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Phase.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Phase.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Phase.scala
index 45537441ee7a3..2908bede327dd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Phase.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Phase.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 trait Phase {
   self =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanBuilder.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanBuilder.scala
index 85e786c524c47..6b52f1f8d21a4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanBuilder.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
 
 /*
 PlanBuilders are basically partial functions that can execute for some input, and can answer if an
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprint.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprint.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprint.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprint.scala
index e41692978a4cb..75b42f03d6e32 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprint.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprint.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, GraphStatisticsSnapshot}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, GraphStatisticsSnapshot}
 import org.neo4j.helpers.Clock
 
 case class PlanFingerprint(creationTimeMillis: Long, txId: Long, snapshot: GraphStatisticsSnapshot)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ProcedureCallMode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ProcedureCallMode.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ProcedureCallMode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ProcedureCallMode.scala
index 32c9e6be3c5f7..46fe50cba126b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ProcedureCallMode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ProcedureCallMode.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
 
 import scala.collection.mutable.ArrayBuffer
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Provider.java b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Provider.java
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Provider.java
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Provider.java
index 1914a7b86bcaf..4af6ef3232da6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/Provider.java
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/Provider.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan;
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan;
 
 public interface Provider<T>
 {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/SilentFallbackPlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/SilentFallbackPlanBuilder.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/SilentFallbackPlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/SilentFallbackPlanBuilder.scala
index fcf2567de33f4..b9d287dbcf8f9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/SilentFallbackPlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/SilentFallbackPlanBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.{PreparedQuery, PreparedQuerySemantics, CompilationPhaseTracer, PreparedQuerySyntax}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.PlannerUnsupportedNotification
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.{PreparedQuery, PreparedQuerySemantics, CompilationPhaseTracer, PreparedQuerySyntax}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.PlannerUnsupportedNotification
 
 trait FallbackBuilder extends ExecutablePlanBuilder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/StandardInternalExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/StandardInternalExecutionResult.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/StandardInternalExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/StandardInternalExecutionResult.scala
index 4cb083618c1cd..11311c40abc6f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/StandardInternalExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/StandardInternalExecutionResult.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.io.{PrintWriter, StringWriter}
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{RuntimeJavaValueConverter, RuntimeScalaValueConverter, RuntimeTextValueConverter}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{Planner, Runtime}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{TaskCloser, _}
-import org.neo4j.cypher.internal.frontend.v3_0.EntityNotFoundException
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{RuntimeJavaValueConverter, RuntimeScalaValueConverter, RuntimeTextValueConverter}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{Planner, Runtime}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{TaskCloser, _}
+import org.neo4j.cypher.internal.frontend.v3_1.EntityNotFoundException
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.graphdb.ResourceIterator
 
 import scala.collection.{Map, mutable}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/UpdateCounter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/UpdateCounter.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/UpdateCounter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/UpdateCounter.scala
index f58d9ac60d553..e7dfeec456f67 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/UpdateCounter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/UpdateCounter.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 class UpdateCounter {
   private var uncommittedRows = 0L
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/addEagernessIfNecessary.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/addEagernessIfNecessary.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/addEagernessIfNecessary.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/addEagernessIfNecessary.scala
index 634aec717e38d..4837c4735285e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/addEagernessIfNecessary.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/addEagernessIfNecessary.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EagerPipe, Pipe}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EagerPipe, Pipe}
 
 object addEagernessIfNecessary extends (Pipe => Pipe) {
   private val DEBUG = false
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilder.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilder.scala
index 8b013c6ed297a..0d7d0eddaa046 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilder.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, EagerAggregationPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress, PartiallySolvedQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CachedExpression, AggregationExpression, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ReturnItem
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, EagerAggregationPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress, PartiallySolvedQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CachedExpression, AggregationExpression, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ReturnItem
 import java.util.UUID
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilder.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilder.scala
index 07a41bdbf96df..c242b6909c1d9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, Pipe, ColumnFilterPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, PartiallySolvedQuery, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{AllVariables, ReturnItem, ReturnColumn}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, Pipe, ColumnFilterPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, PartiallySolvedQuery, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{AllVariables, ReturnItem, ReturnColumn}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 /**
  * This class should get rid of any extra columns built up while building the execution plan, that weren't in the
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala
index 863d4729ccb12..d037661727676 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ShortestPath
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ShortestPath
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 
 class DisconnectedShortestPathEndPointsBuilder extends PlanBuilder {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilder.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilder.scala
index 3e03d14b0d9a3..09dd8b75b9f70 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, DistinctPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, DistinctPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 
 class DistinctBuilder extends PlanBuilder {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilder.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilder.scala
index c1d931fe35b0a..af2bd7a8e5333 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilder.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EmptyResultPipe, PipeMonitor}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EmptyResultPipe, PipeMonitor}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 /**
  * This builder should make sure that the execution result is consumed, even if the user didn't ask for any results
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilder.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilder.scala
index 667e044bbe6b7..81983e0122e25 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, ExtractPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, CachedExpression, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.AllVariables
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, ExtractPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, CachedExpression, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.AllVariables
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 /**
  * This builder will materialize expression results down to the result map, so they can be seen by the user
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilder.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilder.scala
index 596140833ab14..75f5496d6dbf8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{True, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, FilterPipe, Pipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{True, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, FilterPipe, Pipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class FilterBuilder extends PlanBuilder {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/GetGraphElements.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/GetGraphElements.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/GetGraphElements.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/GetGraphElements.scala
index 1cb223bbe289f..bead136d05feb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/GetGraphElements.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/GetGraphElements.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.neo4j.graphdb.PropertyContainer
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIterator.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIterator.scala
index ccff10c8184c5..cb547d6878f17 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIterator.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
 
 /*
 For each element in the input iterator, the ifClause will get a chance to run. If it returns an empty
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilder.scala
index b58c88faac59a..15f36f8b8b874 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilder.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{MatchText, ParsedLikePattern, WildcardLikePatternOp}
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound, IndexHintException}
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{MatchText, ParsedLikePattern, WildcardLikePatternOp}
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound, IndexHintException}
 
 class IndexLookupBuilder extends PlanBuilder {
   def canWorkWith(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilder.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilder.scala
index 6285eb9618dc1..d6ace9ba3eb19 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, HasHeaders, NoHeaders, LoadCSVPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.LoadCSV
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, HasHeaders, NoHeaders, LoadCSVPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.LoadCSV
 
 class LoadCSVBuilder extends PlanBuilder {
   def canWorkWith(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor): Boolean = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilder.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilder.scala
index d4e5130bda749..cb85455760040 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, MatchPipe, Pipe}
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ShortestPath
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, MatchPipe, Pipe}
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ShortestPath
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class MatchBuilder extends PlanBuilder with PatternGraphBuilder {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilder.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilder.scala
index b0a982c914fca..4db6a2c2346d2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilder.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.RelatedTo
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, UnresolvedProperty}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.MergePatternAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{MergeIntoPipe, PipeMonitor}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.RelatedTo
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, UnresolvedProperty}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.MergePatternAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{MergeIntoPipe, PipeMonitor}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 class MergeIntoBuilder extends PlanBuilder {
   override def canWorkWith(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergePatternBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergePatternBuilder.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergePatternBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergePatternBuilder.scala
index ac0933ab31e0c..6265da28b35b1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergePatternBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergePatternBuilder.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.{AllVariables, Pattern, Query}
 import commands.expressions.Variable
 import executionplan.{ExecutionPlanInProgress, Phase, PartiallySolvedQuery, PlanBuilder}
 import mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes._
 import spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 /*
 This class solves MERGE for patterns. It does this by creating an execution plan that uses normal pattern matching
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilder.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilder.scala
index f22b446042399..914e9891da07e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilder.scala
@@ -17,22 +17,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PartiallySolvedQuery, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UniqueMergeNodeProducers
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.MergeNodeAction
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanInProgress
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SchemaIndex
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.PlainMergeNodeProducer
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PartiallySolvedQuery, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UniqueMergeNodeProducers
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.MergeNodeAction
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanInProgress
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SchemaIndex
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.PlainMergeNodeProducer
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
 
 /*
 This builder is concerned with finding queries that use MERGE, and finds a way to try to find matching nodes
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilder.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilder.scala
index eda762a9fb6b8..5923153a8a261 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.NamedPath
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, NamedPathPipe, Pipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.NamedPath
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, NamedPathPipe, Pipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class NamedPathBuilder extends PlanBuilder {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategy.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategy.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategy.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategy.scala
index 075e64038aa33..aa2174b8f3651 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategy.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategy.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 /*
 This rather simple class finds a starting strategy for a given single node and a list of predicates required
@@ -60,7 +60,7 @@ object NodeFetchStrategy {
   val Global = 5
 }
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.NodeFetchStrategy.{Global, IndexEquality, LabelScan, Single}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.NodeFetchStrategy.{Global, IndexEquality, LabelScan, Single}
 
 /*
 Bundles a possible start item with a rating (where lower implies better) and a list of predicates that
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/OptionalMatchBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/OptionalMatchBuilder.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/OptionalMatchBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/OptionalMatchBuilder.scala
index d76c8da52bf23..3491efaf696e0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/OptionalMatchBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/OptionalMatchBuilder.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, Phase, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, Phase, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 case class OptionalMatchBuilder(solveMatch: Phase) extends PlanBuilder {
   def canWorkWith(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor): Boolean = plan.query.optional
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilder.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilder.scala
index d84b7bbfcd883..64f48f6217ed8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Pattern, RelatedTo, VarLengthRelatedTo}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{PatternGraph, PatternNode, PatternRelationship}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Pattern, RelatedTo, VarLengthRelatedTo}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{PatternGraph, PatternNode, PatternRelationship}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriter.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriter.scala
index 6719017534cd7..5c245fc0e1177 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriter.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Property, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, UnresolvedProperty}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, Namer, PlanBuilder, RandomNamer}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Property, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, UnresolvedProperty}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, Namer, PlanBuilder, RandomNamer}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryStateSettingIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryStateSettingIterator.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryStateSettingIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryStateSettingIterator.scala
index 5762f3bb028ac..1acc71841235d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryStateSettingIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryStateSettingIterator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
 
 class QueryStateSettingIterator(input: Iterator[ExecutionContext], state: QueryState)
   extends Iterator[ExecutionContext] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryToken.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryToken.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryToken.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryToken.scala
index 3899381b1d659..41a0d407560a7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/QueryToken.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/QueryToken.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 
 abstract sealed class QueryToken[T](val token: T) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/RelationshipByIdBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/RelationshipByIdBuilder.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/RelationshipByIdBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/RelationshipByIdBuilder.scala
index f12d0e7c6b1d9..991ae6cdeb0d4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/RelationshipByIdBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/RelationshipByIdBuilder.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{RelationshipById, StartItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.GetGraphElements.getElements
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EntityProducer, PipeMonitor, QueryState, RelationshipStartPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{RelationshipById, StartItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.GetGraphElements.getElements
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EntityProducer, PipeMonitor, QueryState, RelationshipStartPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 import org.neo4j.graphdb.Relationship
 
 import scala.collection.Seq
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilder.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilder.scala
index 7be281929c240..618f7afdc4dfb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Pattern, ShortestPath}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, ShortestPathPipe, Pipe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Pattern, ShortestPath}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, ShortestPathPipe, Pipe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class ShortestPathBuilder extends PlanBuilder {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilder.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilder.scala
index 4e5f7f17b4974..037688dd14c53 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilder.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, SlicePipe}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, SlicePipe}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class SliceBuilder extends PlanBuilder {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilder.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilder.scala
index 6424ac35da858..2bc26a4e67db2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CachedExpression, Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LegacySortPipe, PipeMonitor}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CachedExpression, Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LegacySortPipe, PipeMonitor}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 
 class SortBuilder extends PlanBuilder with SortingPreparations {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilder.scala
index 3e4565bccc2a8..ad17d1e9b9afa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilder.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Equals
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Equals
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 import org.neo4j.graphdb.{Node, Relationship}
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilder.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilder.scala
index 8835f25255d17..bb1b7a1bba3a3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilder.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{MatchPattern, PartiallySolvedQuery, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanInProgress
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ShortestPath
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{MatchPattern, PartiallySolvedQuery, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanInProgress
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ShortestPath
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
 
 /*
 This builder is concerned with finding queries without start items and without index hints, and
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopPipeBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopPipeBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopPipeBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopPipeBuilder.scala
index 09f80b9710d0f..9cb7b13f356de 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopPipeBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopPipeBuilder.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CachedExpression, Add, Literal, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Slice, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, Top1Pipe, TopNPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CachedExpression, Add, Literal, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Slice, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, Top1Pipe, TopNPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class TopPipeBuilder extends PlanBuilder with SortingPreparations {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilder.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilder.scala
index dcec38a869069..0c4f1aa79505c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{EndPoint, RelationshipVariable, SingleStepTrail, VariableLengthStepTrail, _}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{EndPoint, RelationshipVariable, SingleStepTrail, VariableLengthStepTrail, _}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TraversalMatcherBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TraversalMatcherBuilder.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TraversalMatcherBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TraversalMatcherBuilder.scala
index 6d24eb55e41aa..543797fbe2ecc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TraversalMatcherBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TraversalMatcherBuilder.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{IdFunction, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{Trail, TraversalMatcher}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EntityProducer, PipeMonitor, SingleRowPipe, TraversalMatchPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{IdFunction, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{Trail, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EntityProducer, PipeMonitor, SingleRowPipe, TraversalMatchPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 class TraversalMatcherBuilder extends PlanBuilder with PatternGraphBuilder {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnionBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnionBuilder.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnionBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnionBuilder.scala
index 1aa98d2991b78..3ab82ae228f0c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnionBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnionBuilder.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.PlannerName
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Query, Union}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PipeInfo
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{DistinctPipe, PipeMonitor, UnionPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.PlannerName
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Query, Union}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PipeInfo
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{DistinctPipe, PipeMonitor, UnionPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 
 trait GraphQueryBuilder {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilder.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilder.scala
index 322d674302c00..f1cfbf87c97f5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilder.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, UnwindPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.Unwind
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, UnwindPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.Unwind
 
 class UnwindBuilder extends PlanBuilder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilder.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilder.scala
index 6473862602000..93f7da16ef43c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PlanBuilder, ExecutionPlanInProgress}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, Pipe, ExecuteUpdateCommandsPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UpdateAction
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{UpdatingStartItem, StartItem}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PlanBuilder, ExecutionPlanInProgress}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, Pipe, ExecuteUpdateCommandsPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UpdateAction
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{UpdatingStartItem, StartItem}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class UpdateActionBuilder extends PlanBuilder with UpdateCommandExpander {
   def apply(plan: ExecutionPlanInProgress, ctx: PlanContext)(implicit pipeMonitor: PipeMonitor) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpander.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpander.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpander.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpander.scala
index bc4b3ea91dc67..e42acc32ca56a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpander.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpander.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Variable
 import mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 /*
 Expands a query. Example:
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolver.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolver.scala
index 09ecac130cac6..73da6240a3d02 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolver.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.prepare
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.prepare
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PartiallySolvedQuery, ExecutionPlanInProgress, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{TokenContext, PlanContext}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.PipeMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PartiallySolvedQuery, ExecutionPlanInProgress, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{TokenContext, PlanContext}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.PipeMonitor
 
 class KeyTokenResolver extends PlanBuilder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/checkForEagerLoadCsv.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/checkForEagerLoadCsv.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/checkForEagerLoadCsv.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/checkForEagerLoadCsv.scala
index c48121a9fae36..3828311651be4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/checkForEagerLoadCsv.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/checkForEagerLoadCsv.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EagerPipe, LoadCSVPipe, Pipe}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{InternalNotification, EagerLoadCsvNotification}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EagerPipe, LoadCSVPipe, Pipe}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{InternalNotification, EagerLoadCsvNotification}
 
 object checkForEagerLoadCsv extends (Pipe => Option[InternalNotification]) {
 
   def apply(pipe: Pipe) = {
-    import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
+    import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
     sealed trait SearchState
     case object NoEagerFound extends SearchState
     case object EagerFound extends SearchState
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/formatOutput.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/formatOutput.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/formatOutput.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/formatOutput.scala
index 11fd0b7dc3ead..0a5d0377ba65f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/formatOutput.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/formatOutput.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.io.PrintWriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.InternalQueryStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.InternalQueryStatistics
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala
index 80c49bbc3b0b9..7bd68dfe50e06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/DelegatingProcedureExecutablePlanBuilder.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutablePlanBuilder, ExecutionPlan, PlanFingerprint, PlanFingerprintReference, SCHEMA_WRITE}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{FieldSignature, PlanContext, ProcedureSignature, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{CompilationPhaseTracer, PreparedQuerySemantics, SyntaxExceptionCreator}
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutablePlanBuilder, ExecutionPlan, PlanFingerprint, PlanFingerprintReference, SCHEMA_WRITE}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{FieldSignature, PlanContext, ProcedureSignature, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{CompilationPhaseTracer, PreparedQuerySemantics, SyntaxExceptionCreator}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
 
 /**
   * This planner takes on queries that requires no planning such as procedures and schema commands
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlan.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlan.scala
index 8f17278b973a6..406d4c421a51b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlan.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlan, InternalExecutionResult, ProcedureCallMode, READ_ONLY}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{Counter, RuntimeJavaValueConverter}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ExternalCSVResource, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows, Signature}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, ProcedureSignature, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionContext, ExecutionMode, ExplainExecutionResult, ExplainMode, ProcedurePlannerName, ProcedureRuntimeName, TaskCloser, _}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlan, InternalExecutionResult, ProcedureCallMode, READ_ONLY}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{Counter, RuntimeJavaValueConverter}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ExternalCSVResource, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows, Signature}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, ProcedureSignature, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionContext, ExecutionMode, ExplainExecutionResult, ExplainMode, ProcedurePlannerName, ProcedureRuntimeName, TaskCloser, _}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 /**
   * Execution plan for calling procedures
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureExecutionResult.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureExecutionResult.scala
index 2062d4f62bde6..0bbb936b96373 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureExecutionResult.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
 
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ResultRowImpl
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalQueryType, ProcedureCallMode, StandardInternalExecutionResult}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QualifiedProcedureName, InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, InternalQueryStatistics, ProfileMode, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.ProfilerStatisticsNotReadyException
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ResultRowImpl
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalQueryType, ProcedureCallMode, StandardInternalExecutionResult}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QualifiedProcedureName, InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, InternalQueryStatistics, ProfileMode, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.ProfilerStatisticsNotReadyException
 
 /**
   * Execution result of a Procedure
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectExecutionPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectExecutionPlan.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectExecutionPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectExecutionPlan.scala
index 68fdd99e30de1..907fb3f33c5d6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectExecutionPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectExecutionPlan.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlan, InternalExecutionResult, InternalQueryType}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, QueryContext, UpdateCountingQueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, ExplainExecutionResult, ExplainMode, PlannerName, ProcedurePlannerName, ProcedureRuntimeName, RuntimeName}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlan, InternalExecutionResult, InternalQueryType}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, QueryContext, UpdateCountingQueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, ExplainExecutionResult, ExplainMode, PlannerName, ProcedurePlannerName, ProcedureRuntimeName, RuntimeName}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 
 /**
   * Execution plan for performing pure side-effects, i.e. returning no data to the user.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectInternalExecutionResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectInternalExecutionResult.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectInternalExecutionResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectInternalExecutionResult.scala
index a076e1c9a96bd..590e41bb6b59d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/PureSideEffectInternalExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/PureSideEffectInternalExecutionResult.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
 
 import java.io.PrintWriter
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalQueryType, StandardInternalExecutionResult}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, InternalQueryStatistics}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalQueryType, StandardInternalExecutionResult}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, InternalQueryStatistics}
 
 /**
   * Empty result, as produced by a pure side-effect.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/verifiers/Verifier.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/verifiers/Verifier.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/verifiers/Verifier.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/verifiers/Verifier.scala
index 29a5dcc68f0dd..08bf00a2f0555 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/verifiers/Verifier.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/verifiers/Verifier.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.verifiers
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.verifiers
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.AbstractQuery
+import org.neo4j.cypher.internal.compiler.v3_1.commands.AbstractQuery
 
 abstract class Verifier {
   protected def verifyFunction: PartialFunction[AbstractQuery, Unit]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMap.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMap.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMap.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMap.scala
index 206b4458ec7b2..0a632e107fd12 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMap.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMap.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import scala.reflect._
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunction.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunction.scala
index e0da7af3e532a..a30fa294ccfa9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunction.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CastSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CastSupport.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CastSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CastSupport.scala
index 8d03e0fac6e97..f2656b09d24e0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CastSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CastSupport.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CollectionSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CollectionSupport.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CollectionSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CollectionSupport.scala
index bcdeb12f1ae37..bd1d9a5e7ca6d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CollectionSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CollectionSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.lang.{Iterable => JavaIterable}
 import java.util.{Map => JavaMap}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Counter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Counter.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Counter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Counter.scala
index 94ad2dbce2d2d..4dd493c16ae9b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Counter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Counter.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 object Counter {
   def apply(initialCount: Long = 0) = new Counter(initialCount)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/DynamicIterable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/DynamicIterable.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/DynamicIterable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/DynamicIterable.scala
index bca2bf7d2e2db..f28bf81d9338a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/DynamicIterable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/DynamicIterable.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.lang.{Iterable => JIterable}
 import java.util.{Iterator => JIterator}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/IteratorSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/IteratorSupport.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/IteratorSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/IteratorSupport.scala
index 4d11fb89f1410..d3da44ece08e2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/IteratorSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/IteratorSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 object IteratorSupport {
   implicit final class RichIterator[T](iterator: Iterator[T]) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/JavaConversionSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/JavaConversionSupport.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/JavaConversionSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/JavaConversionSupport.scala
index ba8e0d33495ce..f537ccaaf3c1c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/JavaConversionSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/JavaConversionSupport.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import org.neo4j.collection.primitive.{PrimitiveIntIterator, PrimitiveLongIterator}
-import org.neo4j.cypher.internal.frontend.v3_0.EntityNotFoundException
+import org.neo4j.cypher.internal.frontend.v3_1.EntityNotFoundException
 
 object JavaConversionSupport {
   def asScala(iterator: PrimitiveLongIterator): Iterator[Long] = new Iterator[Long] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LabelSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LabelSupport.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LabelSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LabelSupport.scala
index 1c287dae7bb46..e16b6652dd480 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LabelSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LabelSupport.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.values.{TokenType, KeyToken}
 
 object LabelSupport extends CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterable.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterable.scala
index 8174b3cf5009c..08cabfa094deb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterable.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 object LazyIterable {
   def apply[T](f: => Iterator[T]) = new LazyIterable[T] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LiteralTypeSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LiteralTypeSupport.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LiteralTypeSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LiteralTypeSupport.scala
index a47f1beebe68a..febe05e60db04 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LiteralTypeSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LiteralTypeSupport.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 object LiteralTypeSupport {
   def deriveType(obj: Any): CypherType = obj match {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/MapSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/MapSupport.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/MapSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/MapSupport.scala
index fbabdf8d11901..1d49180a09ad6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/MapSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/MapSupport.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.util.{Map => JavaMap}
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.EntityNotFoundException
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.EntityNotFoundException
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Materialized.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Materialized.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Materialized.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Materialized.scala
index 2f83c9173ec8a..2c08ccd005e66 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Materialized.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Materialized.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import scala.collection.{TraversableLike, immutable, mutable}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PartialFunctionSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PartialFunctionSupport.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PartialFunctionSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PartialFunctionSupport.scala
index 9542c15bdbd06..71ee7793dc7ac 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PartialFunctionSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PartialFunctionSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import scala.reflect.ClassTag
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PrefixNameGenerator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PrefixNameGenerator.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PrefixNameGenerator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PrefixNameGenerator.scala
index 78b8e43fdc63f..69ee7f0bd67f5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PrefixNameGenerator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PrefixNameGenerator.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 object FreshIdNameGenerator extends PrefixNameGenerator("FRESHID")
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PropertySupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PropertySupport.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PropertySupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PropertySupport.scala
index 4f2eb731e9915..dc1f50e572470 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/PropertySupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/PropertySupport.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
 
 object PropertySupport {
   def firstNullPropertyIfAny[T](props: collection.Map[T, Expression], context: ExecutionContext, state: QueryState): Option[T] =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeJavaValueConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeJavaValueConverter.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeJavaValueConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeJavaValueConverter.scala
index a8254a62bd985..e1a0258f10686 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeJavaValueConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeJavaValueConverter.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.util.{List => JavaList, Map => JavaMap}
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly.immutableMapValues
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly.immutableMapValues
 import org.neo4j.graphdb.{Node, Path, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeScalaValueConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeScalaValueConverter.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeScalaValueConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeScalaValueConverter.scala
index 04f64e99755ce..85d3ca58c31d6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeScalaValueConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeScalaValueConverter.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.lang.{Iterable => JavaIterable}
 import java.util.{Map => JavaMap}
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly.immutableMapValues
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly.immutableMapValues
 
 import scala.collection.JavaConverters._
 import scala.collection.immutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeTextValueConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeTextValueConverter.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeTextValueConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeTextValueConverter.scala
index eec73ef0633bb..b5268f22a7b20 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RuntimeTextValueConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RuntimeTextValueConverter.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
 import org.neo4j.graphdb.{Node, Path, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibility.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibility.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibility.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibility.scala
index 159ff1d488894..5b757f969881f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibility.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibility.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.lang.{Iterable => JavaIterable}
 import java.util.{Map => JavaMap}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StringRenderingSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StringRenderingSupport.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StringRenderingSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StringRenderingSupport.scala
index 7d6cd7d00f7a4..e115057dcb591 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StringRenderingSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StringRenderingSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 /**
  * Subclasses prefer to use StringBuilders to render themselves
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Tapper.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Tapper.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Tapper.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Tapper.scala
index 32e6a3f80cf7f..326e97c512094 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/Tapper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/Tapper.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 object Tapper {
   implicit class Tapped[V](value: V) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TypeSafeMathSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TypeSafeMathSupport.scala
similarity index 99%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TypeSafeMathSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TypeSafeMathSupport.scala
index f8af24ae44fb0..503f57602cbeb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TypeSafeMathSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TypeSafeMathSupport.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.ArithmeticException
+import org.neo4j.cypher.internal.frontend.v3_1.ArithmeticException
 
 trait TypeSafeMathSupport {
   def plus(left: Any, right: Any): Any = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrMany.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrMany.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrMany.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrMany.scala
index 3a67650bc3ab4..43649c904a998 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrMany.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrMany.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 sealed trait ZeroOneOrMany[+T]
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/package.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/package.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/package.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/package.scala
index 4307437098a61..513015f8bd858 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/package.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/package.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 package object helpers {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/simpleExpressionEvaluator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/simpleExpressionEvaluator.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/simpleExpressionEvaluator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/simpleExpressionEvaluator.scala
index 8c74d74499f3d..084bf066f8d05 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/simpleExpressionEvaluator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/simpleExpressionEvaluator.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{NullPipeDecorator, QueryState}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions.{Rand, Timestamp}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{FunctionInvocation, FunctionName, Parameter, Expression}
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherException => InternalCypherException}
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{NullPipeDecorator, QueryState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions.{Rand, Timestamp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{FunctionInvocation, FunctionName, Parameter, Expression}
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherException => InternalCypherException}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateNode.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateNode.scala
index dd3d857fce0a2..f2a3945319681 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateNode.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsMap, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{ParameterWrongTypeException, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsMap, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{ParameterWrongTypeException, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateRelationship.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateRelationship.scala
index 21fc800c4865e..ef119a2499b4a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateRelationship.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{CreatesRelationship, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{CreatesRelationship, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateUniqueAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateUniqueAction.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateUniqueAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateUniqueAction.scala
index 2c377896fc4e9..e28f3e0552828 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/CreateUniqueAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/CreateUniqueAction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.{PatternException, UniquePathNotUniqueException}
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.{PatternException, UniquePathNotUniqueException}
 import org.neo4j.graphdb.{Node, PropertyContainer}
 
 case class CreateUniqueAction(incomingLinks: UniqueLink*) extends UpdateAction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeleteEntityAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeleteEntityAction.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeleteEntityAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeleteEntityAction.scala
index 25fa22918d451..3559b71b1404a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeleteEntityAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeleteEntityAction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{ContainerIndex, Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{ContainerIndex, Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeletePropertyAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeletePropertyAction.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeletePropertyAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeletePropertyAction.scala
index 420209f42fb2c..a6c925fc2944f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/DeletePropertyAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/DeletePropertyAction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class DeletePropertyAction(element: Expression, propertyKey: KeyToken)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachAction.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachAction.scala
index 92a75794140f4..c9f0b9da2abac 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachAction.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ForeachAction(collection: Expression, id: String, actions: Seq[UpdateAction])
   extends UpdateAction
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctions.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctions.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctions.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctions.scala
index 2bcbfcb7eb0cd..86198983913e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctions.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctions.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
 import java.util.{Map => JavaMap}
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MapPropertySetAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MapPropertySetAction.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MapPropertySetAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MapPropertySetAction.scala
index c6f61e48158c2..6b65690436681 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MapPropertySetAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MapPropertySetAction.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsMap, MapSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsMap, MapSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergeNodeAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergeNodeAction.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergeNodeAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergeNodeAction.scala
index 5525d6fc55d26..40c24b16b8b5f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergeNodeAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergeNodeAction.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.PropertySupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EntityProducer, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, InvalidSemanticsException, MergeConstraintConflictException}
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.PropertySupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EntityProducer, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, InvalidSemanticsException, MergeConstraintConflictException}
 import org.neo4j.graphdb.Node
 
 final case class IndexNodeProducer(label: KeyToken, propertyKey: KeyToken, producer: EntityProducer[Node]) extends EntityProducer[Node] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternAction.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternAction.scala
index d8fe7ce478503..4d2e3212ef165 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternAction.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.PropertySupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{MatchPipe, Pipe, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.MergePattern
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, InvalidSemanticsException}
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.PropertySupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{MatchPipe, Pipe, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.MergePattern
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, InvalidSemanticsException}
 import org.neo4j.graphdb.Node
 
 case class MergePatternAction(patterns: Seq[Pattern],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/NamedExpectation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/NamedExpectation.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/NamedExpectation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/NamedExpectation.scala
index c0e775c165ea0..ee8f775b986d2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/NamedExpectation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/NamedExpectation.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions._
 import commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.TypeSafe
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.TypeSafe
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.Operations
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.Operations
 import org.neo4j.graphdb.{Relationship, Node, PropertyContainer}
 import collection.Map
-import org.neo4j.cypher.internal.compiler.v3_0.helpers._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers._
 
 object NamedExpectation {
   def apply(name: String): NamedExpectation = NamedExpectation(name, Map.empty)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/PropertySetAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/PropertySetAction.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/PropertySetAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/PropertySetAction.scala
index 7c0188918f7dd..3a937147599ae 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/PropertySetAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/PropertySetAction.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class PropertySetAction(prop: Property, valueExpression: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/SetAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/SetAction.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/SetAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/SetAction.scala
index 49200c9e2ddb0..414c89d364556 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/SetAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/SetAction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
 
 trait SetAction extends UpdateAction with GraphElementPropertyFunctions {
   def rewrite(f: (Expression) => Expression): SetAction
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLink.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLink.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLink.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLink.scala
index ea08698842d39..f694748f771da 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLink.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLink.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{IsMap, MapSupport, UnNamedNameGenerator}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, SyntaxException, UniquePathNotUniqueException}
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{IsMap, MapSupport, UnNamedNameGenerator}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, SyntaxException, UniquePathNotUniqueException}
 import org.neo4j.graphdb.{Node}
 
 import scala.collection.Map
@@ -192,7 +192,8 @@ case class UniqueLink(start: NamedExpectation, end: NamedExpectation, rel: Named
   /**
    * Either returns a unique link where the expectation is respected,
    * or throws an exception if a contradiction is found.
-   * @param expectation The named expectation to follow
+    *
+    * @param expectation The named expectation to follow
    * @return
    */
   def expect(expectation: NamedExpectation): UniqueLink = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateAction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateAction.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateAction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateAction.scala
index c3c16e735c91a..182f5c4ee03bb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateAction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateAction.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{AstNode, EffectfulAstNode}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{SymbolTable, TypeSafe}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{AstNode, EffectfulAstNode}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{SymbolTable, TypeSafe}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 
 trait UpdateAction extends TypeSafe with AstNode[UpdateAction] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/makeValueNeoSafe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/makeValueNeoSafe.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/makeValueNeoSafe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/makeValueNeoSafe.scala
index feb6fa2d3cb61..394f1441c9739 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/makeValueNeoSafe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/makeValueNeoSafe.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
 
 object makeValueNeoSafe extends (Any => Any) with CollectionSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipe.scala
index 65eee9ab2fa67..502e88cd3ab95 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class AllNodesScanPipe(ident: String)(val estimatedCardinality: Option[Double] = None)
                            (implicit pipeMonitor: PipeMonitor) extends Pipe with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipe.scala
index cc829aec3aecc..ce33aec890d1b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class ApplyPipe(source: Pipe, inner: Pipe)(val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
   extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipe.scala
index b3697f2ef40da..70ed921b25c3b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{SymbolTable, SymbolTypeAssertionCompiler}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{SymbolTable, SymbolTypeAssertionCompiler}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ArgumentPipe(symbols: SymbolTable)
                        (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AssertSameNodePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AssertSameNodePipe.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AssertSameNodePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AssertSameNodePipe.scala
index 4a07f8ce2d656..01f4d71a12cc6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AssertSameNodePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AssertSameNodePipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CastSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.MergeConstraintConflictException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CastSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.MergeConstraintConflictException
 import org.neo4j.graphdb.Node
 
 case class AssertSameNodePipe(source: Pipe, inner: Pipe, node: String)(val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CachingExpandInto.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CachingExpandInto.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CachingExpandInto.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CachingExpandInto.scala
index 3f68db1ea489b..914349d119405 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CachingExpandInto.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CachingExpandInto.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.util.concurrent.ThreadLocalRandom
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection}
 import org.neo4j.graphdb.{Relationship, Node}
 import org.neo4j.helpers.collection.PrefetchingIterator
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CartesianProductPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CartesianProductPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CartesianProductPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CartesianProductPipe.scala
index 8e5db38995d7a..3b6c0c38a56fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CartesianProductPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CartesianProductPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class CartesianProductPipe(lhs: Pipe, rhs: Pipe)(val estimatedCardinality: Option[Double] = None)
                                (implicit pipeMonitor: PipeMonitor) extends Pipe with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipe.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipe.scala
index e962c5cebc251..0f497023c1e0b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipe.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator.isNamed
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, SingleChild}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator.isNamed
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, SingleChild}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects._
 
 
 case class ColumnFilterPipe(source: Pipe, returnItems: Seq[ReturnItem])
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConditionalApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConditionalApplyPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConditionalApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConditionalApplyPipe.scala
index 689a0b039990c..fc96ec00c2b99 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConditionalApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConditionalApplyPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class ConditionalApplyPipe(source: Pipe, inner: Pipe, items: Seq[String], negated: Boolean)(val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
   extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConstraintOperationPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConstraintOperationPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConstraintOperationPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConstraintOperationPipe.scala
index 344c55b7ca054..e83c224b1fd1e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ConstraintOperationPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ConstraintOperationPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ConstraintOperationPipe(op: PropertyConstraintOperation, keyToken: KeyToken, propertyKey: KeyToken)
                              (implicit val monitor: PipeMonitor) extends Pipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateNodePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateNodePipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateNodePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateNodePipe.scala
index a3315864a40b7..665fc2cf0d803 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateNodePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateNodePipe.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{CreatesAnyNode, CreatesNodesWithLabels, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CollectionSupport, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, InvalidSemanticsException}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{CreatesAnyNode, CreatesNodesWithLabels, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CollectionSupport, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, InvalidSemanticsException}
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateRelationshipPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateRelationshipPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateRelationshipPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateRelationshipPipe.scala
index e26b9172af8f5..e1a96f6c4090c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/CreateRelationshipPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/CreateRelationshipPipe.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{CreatesRelationship, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CollectionSupport, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, InternalException, InvalidSemanticsException}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{CreatesRelationship, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CollectionSupport, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{GraphElementPropertyFunctions, makeValueNeoSafe}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, InternalException, InvalidSemanticsException}
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DeletePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DeletePipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DeletePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DeletePipe.scala
index 202c71968d6c6..3c1ac826de9dd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DeletePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DeletePipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.GraphElementPropertyFunctions
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.GraphElementPropertyFunctions
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, SemanticDirection}
 import org.neo4j.graphdb.{Node, Path, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedRelationshipByIdSeekPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedRelationshipByIdSeekPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedRelationshipByIdSeekPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedRelationshipByIdSeekPipe.scala
index d67406c146573..926876bb7e3c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedRelationshipByIdSeekPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedRelationshipByIdSeekPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class DirectedRelationshipByIdSeekPipe(ident: String, relIdExpr: SeekArgs, toNode: String, fromNode: String)
                                            (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipe.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipe.scala
index 7f8f806bfbafc..06fbe9624456c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipe.scala
index 9122c41fe746a..0892c47001be9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.AggregationExpression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation.AggregationFunction
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.AggregationExpression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation.AggregationFunction
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 import scala.collection.mutable.{Map => MutableMap}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipe.scala
index 56011ff7ca83f..3850a3baa480e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 trait NoEffectsPipe {
   self: Pipe =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EmptyResultPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EmptyResultPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EmptyResultPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EmptyResultPipe.scala
index a2bdf8df28dfd..99720764c1e4c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EmptyResultPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EmptyResultPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{SingleRowPlanDescription, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{SingleRowPlanDescription, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class EmptyResultPipe(source: Pipe)(implicit pipeMonitor: PipeMonitor) extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EntityProducer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EntityProducer.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EntityProducer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EntityProducer.scala
index 5247c6f285e04..07914292f7958 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EntityProducer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EntityProducer.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
 import org.neo4j.graphdb.PropertyContainer
 
 trait EntityProducer[T <: PropertyContainer] extends ((ExecutionContext, QueryState) => Iterator[T]) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipe.scala
index 1c6cf1d92a98e..cb42796a750e5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class ErrorPipe(source: Pipe, exception: Exception)(val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
   extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExecuteUpdateCommandsPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExecuteUpdateCommandsPipe.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExecuteUpdateCommandsPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExecuteUpdateCommandsPipe.scala
index d94d35d841b0d..24ffc58bfa99f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExecuteUpdateCommandsPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExecuteUpdateCommandsPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, InternalException, SyntaxException}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, InternalException, SyntaxException}
 import org.neo4j.graphdb.NotInTransactionException
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipe.scala
index fe371034cf5f1..a4c8c5c527f1d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection}
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class ExpandAllPipe(source: Pipe,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipe.scala
index b0e431fab6485..54753189f26b9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 /**
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExternalCSVResource.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExternalCSVResource.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExternalCSVResource.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExternalCSVResource.scala
index e7c82b61b7ac3..a437c884a2380 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExternalCSVResource.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExternalCSVResource.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.net.URL
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExtractPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExtractPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExtractPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExtractPipe.scala
index 329da20c7bb26..4f02d099b60b8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExtractPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExtractPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CachedExpression, Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, SingleChild}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CachedExpression, Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, SingleChild}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 object ExtractPipe {
   def apply(source: Pipe, expressions: Map[String, Expression])(implicit pipeMonitor: PipeMonitor): ExtractPipe = source match {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FilterPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FilterPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FilterPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FilterPipe.scala
index aedcb1b0aff51..0a039eabc80d8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FilterPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FilterPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
 
 case class FilterPipe(source: Pipe, predicate: Predicate)(val estimatedCardinality: Option[Double] = None)
                      (implicit pipeMonitor: PipeMonitor) extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ForeachPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ForeachPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ForeachPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ForeachPipe.scala
index dddef9abb2f3c..4125a28ef7aa1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ForeachPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ForeachPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 
 case class ForeachPipe(source: Pipe, inner: Pipe, variable: String, expression: Expression)(val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
   extends PipeWithSource(source, pipeMonitor) with RonjaPipe with CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IdSeekIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IdSeekIterator.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IdSeekIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IdSeekIterator.scala
index b06558cdc3616..134d4a59171e2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IdSeekIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IdSeekIterator.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.NumericHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.Operations
-import org.neo4j.cypher.internal.frontend.v3_0.EntityNotFoundException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.NumericHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.Operations
+import org.neo4j.cypher.internal.frontend.v3_1.EntityNotFoundException
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 abstract class IdSeekIterator[T <: PropertyContainer]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexOperationPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexOperationPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexOperationPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexOperationPipe.scala
index ae9ec0b25e1e6..6eda7114c87f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexOperationPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexOperationPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
 
 case class IndexOperationPipe(indexOp: IndexOperation)(implicit val monitor: PipeMonitor) extends Pipe {
   protected def internalCreateResults(state: QueryState): Iterator[ExecutionContext] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexSeekMode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexSeekMode.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexSeekMode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexSeekMode.scala
index 148b44b1393d2..69ffd6e21b293 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/IndexSeekMode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/IndexSeekMode.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{QueryExpression, RangeQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{QueryExpression, RangeQueryExpression}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyLabel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyLabel.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyLabel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyLabel.scala
index 96425a355d058..4319fceccc34f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyLabel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyLabel.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, TokenContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, TokenContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, SemanticTable}
 
 case class LazyLabel(name: String) {
   private var id: Option[LabelId] = None
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKey.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKey.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKey.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKey.scala
index ee659f3fe7120..bb2f73b45ade6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKey.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKey.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{PropertyKeyName, LabelName}
-import org.neo4j.cypher.internal.frontend.v3_0.{PropertyKeyId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{PropertyKeyName, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_1.{PropertyKeyId, SemanticTable}
 
 case class LazyPropertyKey(name: String) {
   private var id: Option[PropertyKeyId] = None
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyType.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyType.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyType.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyType.scala
index baf48a88eb2e2..7bbb3676921cf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyType.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyType.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast.RelTypeName
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast.RelTypeName
 
 case class LazyType(name: String) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypes.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypes.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypes.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypes.scala
index d6c977c731854..74d26ec8f96dc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypes.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypes.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.RelTypeName
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.{RelTypeId, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.RelTypeName
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.{RelTypeId, SemanticTable}
 
 case class LazyTypes(names:Seq[String]) {
   private var ids = Seq.empty[Int]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LegacySortPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LegacySortPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LegacySortPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LegacySortPipe.scala
index f2ef70426c803..e592bad47f121 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LegacySortPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LegacySortPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SortItem
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SortItem
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
 
 import scala.math.signum
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipe.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipe.scala
index 1c1db40f350f8..56ab0b886bb74 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class LetSelectOrSemiApplyPipe(source: Pipe, inner: Pipe, letVarName: String, predicate: Predicate, negated: Boolean)
                                    (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipe.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipe.scala
index 75355a8550a86..870a7752e7825 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class LetSemiApplyPipe(source: Pipe, inner: Pipe, letVarName: String, negated: Boolean)
                            (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LimitPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LimitPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LimitPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LimitPipe.scala
index 457048fb1445d..5a61bc2963b54 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LimitPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LimitPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, NumericHelper}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, NumericHelper}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class LimitPipe(source: Pipe, exp: Expression)
                     (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LoadCSVPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LoadCSVPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LoadCSVPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LoadCSVPipe.scala
index ea1e9c3053f88..67a237bca7a3e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LoadCSVPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LoadCSVPipe.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.ArrayBackedMap
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.LoadExternalResourceException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{AnyType, ListType, MapType}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.ArrayBackedMap
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.LoadExternalResourceException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{AnyType, ListType, MapType}
 
 sealed trait CSVFormat
 case object HasHeaders extends CSVFormat
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipe.scala
index eefd7f118789d..c7473c8eae303 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{MatchingContext, PatternGraph}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{MatchingContext, PatternGraph}
 
 case class MatchPipe(source: Pipe,
                      predicates: Seq[Predicate],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipe.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipe.scala
index b1fc840afed77..3ae89411c3241 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipe.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{GraphElementPropertyFunctions, SetAction, makeValueNeoSafe}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, InvalidSemanticsException, SemanticDirection}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{GraphElementPropertyFunctions, SetAction, makeValueNeoSafe}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, InvalidSemanticsException, SemanticDirection}
 import org.neo4j.graphdb.{Node, Relationship}
 import org.neo4j.helpers.collection.PrefetchingIterator
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MutableMaps.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MutableMaps.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MutableMaps.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MutableMaps.scala
index 33a9e188a4ba7..d2623f588e3bf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MutableMaps.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MutableMaps.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 object MutableMaps {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipe.scala
index 565b764822f8e..a3c4330eae8c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Path, PropertyContainer}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasher.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasher.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasher.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasher.scala
index 47451ff4ed805..51b55a458c4c2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasher.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 class NiceHasher(val original: Seq[Any]) {
   override def equals(p1: Any): Boolean = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipe.scala
index 2b0d671086d8b..8acfc8146d0e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ReadsAllNodes, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CollectionSupport, IsCollection}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNode
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ReadsAllNodes, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CollectionSupport, IsCollection}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNode
 
 sealed trait SeekArgs {
   def expressions(ctx: ExecutionContext, state: QueryState): Iterable[Any]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelEntityProducer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelEntityProducer.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelEntityProducer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelEntityProducer.scala
index 3e8e92511053c..af07bdc314d39 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelEntityProducer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelEntityProducer.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.NodeByLabel
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.NodeByLabel
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
 import org.neo4j.graphdb.Node
 
 case class NodeByLabelEntityProducer(nodeByLabel: NodeByLabel, labelId: Int) extends EntityProducer[Node] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipe.scala
index 158065537a515..94a760c96903d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsNodesWithLabels}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LabelName
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsNodesWithLabels}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class NodeByLabelScanPipe(ident: String, label: LazyLabel)
                               (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipe.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipe.scala
index 0bf964bbef44d..bfd054cea8688 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.CountNodesExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.NameId
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.CountNodesExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.NameId
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class NodeCountFromCountStorePipe(ident: String, label: Option[LazyLabel])(val estimatedCardinality: Option[Double] = None)
                                                            (implicit pipeMonitor: PipeMonitor) extends Pipe with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipe.scala
index bac0e4c10d24c..4c11802aa93ae 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 import org.neo4j.graphdb.Node
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexContainsScanPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexContainsScanPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexContainsScanPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexContainsScanPipe.scala
index 67317b96cfee0..c4690827bbe68 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexContainsScanPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexContainsScanPipe.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{Index, LegacyExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelToken, PropertyKeyToken}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNode
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{Index, LegacyExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNode
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipe.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipe.scala
index f0e6d53b5857e..0dd9801eedc2f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Index
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelToken, PropertyKeyToken}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNode
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Index
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNode
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 case class NodeIndexScanPipe(ident: String,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipe.scala
index 993b70a93ab34..767fab3da8536 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipe.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, InequalitySeekRangeExpression, PrefixSeekRangeExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{QueryExpression, RangeQueryExpression, indexQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{Index, InequalityIndex, PrefixIndex}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelToken, PropertyKeyToken}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNode
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, InequalitySeekRangeExpression, PrefixSeekRangeExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{QueryExpression, RangeQueryExpression, indexQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsGivenNodeProperty, ReadsNodesWithLabels}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{Index, InequalityIndex, PrefixIndex}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNode
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 case class NodeIndexSeekPipe(ident: String,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipe.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipe.scala
index 7ed45805be776..e0f051da88503 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import org.neo4j.graphdb.Node
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipe.scala
index bd11265eb80e4..6fe7f51b51240 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection}
 import org.neo4j.graphdb.Node
 
 case class OptionalExpandAllPipe(source: Pipe, fromName: String, relName: String, toName: String, dir: SemanticDirection,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipe.scala
index b67ccf0fd74f8..1a0e8cfb3ca4f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Node
 
 import scala.collection.mutable.ListBuffer
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalMatchPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalMatchPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalMatchPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalMatchPipe.scala
index 0db72e1658214..a2b3cc5774246 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalMatchPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalMatchPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.{IfElseIterator, QueryStateSettingIterator}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.{IfElseIterator, QueryStateSettingIterator}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 /**
  * This pipe does optional matches by making sure that the match pipe either finds a match for a start context,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipe.scala
index 32f3dd623e106..57f306f2e17c3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class OptionalPipe(nullableVariables: Set[String], source: Pipe)
                        (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Pipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Pipe.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Pipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Pipe.scala
index 9172b6534f8bc..ceadcfb525217 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Pipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Pipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, InternalPlanDescription, SingleRowPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, InternalPlanDescription, SingleRowPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 import scala.collection.immutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeDecorator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeDecorator.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeDecorator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeDecorator.scala
index 5bda0a206ff0a..7ceba04670cc7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeDecorator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeDecorator.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
 
 /*
 A PipeDecorator is used to instrument calls between Pipes, and between a Pipe and the graph
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipe.scala
index 167ee7d74191b..7f4e069540a50 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipe.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{AllEffects, ProcedureCallMode}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.ScalaCompatibility.asScalaCompatible
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CollectionSupport, RuntimeJavaValueConverter}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Signature
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{AllEffects, ProcedureCallMode}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.ScalaCompatibility.asScalaCompatible
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CollectionSupport, RuntimeJavaValueConverter}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Signature
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 object ProcedureCallRowProcessing {
   def apply(signature: ProcedureSignature) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipe.scala
index 915ea821e01b8..fc2927fc54f7f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
 
 case class ProduceResultsPipe(source: Pipe, columns: Seq[String])(val estimatedCardinality: Option[Double] = None)
                              (implicit pipeMonitor: PipeMonitor) extends PipeWithSource(source, pipeMonitor) with RonjaPipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipe.scala
index 4019a81d52244..871f886df1f1f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ReadsAllNodes, Effects}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ReadsAllNodes, Effects}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class ProjectEndpointsPipe(source: Pipe, relName: String,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectionPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectionPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectionPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectionPipe.scala
index 5d52aa51ff53c..6d03627d6cd97 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectionPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectionPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
 
 /*
 Projection evaluates expressions and stores their values into new slots in the execution context.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryState.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryState.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryState.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryState.scala
index 7d1ff2ea27460..2769e32dc7f97 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryState.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryState.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.util.UUID
 
 import org.neo4j.collection.primitive.PrimitiveLongSet
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathValueBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.ParameterNotFoundException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathValueBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.ParameterNotFoundException
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipe.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipe.scala
index afd9d76670fe8..685d4e0bfce14 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipe.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.CountRelationshipsExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.NameId
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.CountRelationshipsExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.NameId
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class RelationshipCountFromCountStorePipe(ident: String, startLabel: Option[LazyLabel],
                                                  typeNames: LazyTypes, endLabel: Option[LazyLabel],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RemoveLabelsPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RemoveLabelsPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RemoveLabelsPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RemoveLabelsPipe.scala
index af8092b0fba92..7bc3da40fb7fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RemoveLabelsPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RemoveLabelsPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, SetLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.GraphElementPropertyFunctions
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, SetLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.GraphElementPropertyFunctions
 import org.neo4j.graphdb.Node
 case class RemoveLabelsPipe(src: Pipe, variable: String, labels: Seq[LazyLabel])
                         (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RepeatableReadPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RepeatableReadPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RepeatableReadPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RepeatableReadPipe.scala
index 384c2c3d90475..2568f5b24ac60 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RepeatableReadPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RepeatableReadPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 /*
  * Caches the result of the source pipe in QueryContext.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipe.scala
index 7dbbbab2ad98b..ce53014ee54e7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.ListType
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.ListType
 
 case class RollUpApplyPipe(lhs: Pipe, rhs: Pipe, collectionName: String, identifierToCollect: String, nullableIdentifiers: Set[String])
                           (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RonjaPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RonjaPipe.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RonjaPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RonjaPipe.scala
index 6661e068f9ead..30cc364b7d292 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RonjaPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RonjaPipe.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.EstimatedRows
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.EstimatedRows
 
 // Marks a pipe being used by Ronja
 trait RonjaPipe extends Pipe {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipe.scala
index 0837038b1b8ef..1b2bb7cd09bbc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class SelectOrSemiApplyPipe(source: Pipe, inner: Pipe, predicate: Predicate, negated: Boolean)
                                 (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipe.scala
index b8e9652cb4532..35c4d0c62653f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class SemiApplyPipe(source: Pipe, inner: Pipe, negated: Boolean)
                         (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetOperation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetOperation.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetOperation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetOperation.scala
index bb4d5dc5b2e9b..e843d2b74d836 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetOperation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetOperation.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, IsMap}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.makeValueNeoSafe
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{SetLabelPattern, SetMutatingPattern, SetNodePropertiesFromMapPattern, SetNodePropertyPattern, SetRelationshipPropertiesFromMapPattern, SetRelationshipPropertyPattern}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, SemanticTable}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, IsMap}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.makeValueNeoSafe
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{SetLabelPattern, SetMutatingPattern, SetNodePropertiesFromMapPattern, SetNodePropertyPattern, SetRelationshipPropertiesFromMapPattern, SetRelationshipPropertyPattern}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, SemanticTable}
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.Map
@@ -39,7 +39,7 @@ sealed trait SetOperation {
 
 object SetOperation {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
+  import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
 
   def toSetOperation(pattern: SetMutatingPattern)(implicit table: SemanticTable) = pattern match {
     case SetLabelPattern(IdName(name), labels) =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPipe.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPipe.scala
index 06a51062d4ca2..6d919dbcfc217 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPipe.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
 
 case class SetPipe(src: Pipe, setOperation: SetOperation)
                   (val estimatedCardinality: Option[Double] = None)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ShortestPathPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ShortestPathPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ShortestPathPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ShortestPathPipe.scala
index 052ca02609e01..a5d242892c050 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ShortestPathPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ShortestPathPipe.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.ShortestPathExpression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{CastSupport, CollectionSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.ShortestPathExpression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{CastSupport, CollectionSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.Path
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SkipPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SkipPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SkipPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SkipPipe.scala
index 00223480aa2f3..f8cb165358ed3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SkipPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SkipPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, NumericHelper}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, NumericHelper}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 
 case class SkipPipe(source: Pipe, exp: Expression)
                    (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipe.scala
index f4b2819b9fac7..12e01e76089e4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
 
 case class SlicePipe(source: Pipe, skip: Option[Expression], limit: Option[Expression])
                     (implicit pipeMonitor: PipeMonitor) extends PipeWithSource(source, pipeMonitor) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipe.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipe.scala
index 0b9a2aade8f00..8789a65f980d7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipe.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.{Comparer, ExecutionContext}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.{Comparer, ExecutionContext}
 
 case class SortPipe(source: Pipe, orderBy: Seq[SortDescription])
                    (val estimatedCardinality: Option[Double] = None)(implicit monitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipe.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipe.scala
index e2f89bd6737af..330f8941f1079 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipe.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 sealed abstract class StartPipe[T <: PropertyContainer](source: Pipe,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipe.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipe.scala
index 6cdde7f5b8638..003fd9a76f79c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.util.Comparator
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{KeyNames, LegacyExpression}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{KeyNames, LegacyExpression}
 
 import scala.math._
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TraversalMatchPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TraversalMatchPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TraversalMatchPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TraversalMatchPipe.scala
index 275def746996a..da63c3b7f7489 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TraversalMatchPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TraversalMatchPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{Trail, TraversalMatcher}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{Trail, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
 
 import scala.collection.JavaConverters._
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipe.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipe.scala
index 07de8987e872b..8baaaa2da9841 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.neo4j.collection.primitive.{Primitive, PrimitiveLongSet}
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 import org.neo4j.graphdb.Node
 
 import scala.collection.mutable.ListBuffer
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedRelationshipByIdSeekPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedRelationshipByIdSeekPipe.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedRelationshipByIdSeekPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedRelationshipByIdSeekPipe.scala
index 2e4a0934092bd..65c691087670b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedRelationshipByIdSeekPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedRelationshipByIdSeekPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{NoChildren, PlanDescriptionImpl}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{NoChildren, PlanDescriptionImpl}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class UndirectedRelationshipByIdSeekPipe(ident: String, relIdExpr: SeekArgs, toNode: String, fromNode: String)
                                              (val estimatedCardinality: Option[Double] = None)(implicit pipeMonitor: PipeMonitor)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIterator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIterator.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIterator.scala
index abeaf8ec8c9ab..b25b1bf70ac84 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIterator.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 
 class UnionIterator(in: Seq[Pipe], state: QueryState) extends Iterator[ExecutionContext] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipe.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipe.scala
index 8972579d55930..cfb7c62885d3d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipe.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class UnionPipe(sources: List[Pipe], columns:List[String])(implicit val monitor: PipeMonitor) extends Pipe {
   protected def internalCreateResults(state: QueryState): Iterator[ExecutionContext] = new UnionIterator(sources, state)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipe.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipe.scala
index d521dc3dec21d..f72d50f587fc6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipe.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, SingleChild}
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipe.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipe.scala
index d5bbbc95900f8..db680d0aab426 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, PlanDescriptionImpl, TwoChildren}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipe.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipe.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipe.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipe.scala
index 7d0226e75a7c6..170ba4b4530ce 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.ExpandExpression
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsAllNodes, ReadsAllRelationships}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.ExpandExpression
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection}
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregationFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregationFunction.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregationFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregationFunction.scala
index eba355046f1c9..301e9cf0de5f2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregationFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregationFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import pipes.QueryState
 
 /**
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunction.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunction.scala
index b6056ed7067b0..550f7b924adca 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunction.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.TypeSafeMathSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.TypeSafeMathSupport
 import pipes.QueryState
 
 /**
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunction.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunction.scala
index 8996058ffb3a9..24b0a45a23802 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
 import pipes.QueryState
 import collection.mutable.ListBuffer
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountFunction.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountFunction.scala
index 6cb011aa01de8..bef51da77962c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
 import pipes.QueryState
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountStarFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountStarFunction.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountStarFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountStarFunction.scala
index 151523c0c70bc..7c188d0a2cb11 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountStarFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountStarFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import pipes.QueryState
 
 class CountStarFunction extends AggregationFunction {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/DistinctFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/DistinctFunction.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/DistinctFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/DistinctFunction.scala
index f1dfca9a9976f..0c7059e777360 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/DistinctFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/DistinctFunction.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{NiceHasherValue, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{NiceHasherValue, QueryState}
 
 class DistinctFunction(value: Expression, inner: AggregationFunction) extends AggregationFunction {
   val seen = scala.collection.mutable.Set[NiceHasherValue]()
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunction.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunction.scala
index fcd98f86dae6e..9a4950c3278f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunction.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
 
 trait MinMax extends AggregationFunction with Comparer {
   def value: Expression
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/NumericExpressionOnly.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/NumericExpressionOnly.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/NumericExpressionOnly.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/NumericExpressionOnly.scala
index f5636e08c4dc0..d227d0f16326b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/NumericExpressionOnly.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/NumericExpressionOnly.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 
 trait NumericExpressionOnly {
   def name: String
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunction.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunction.scala
index a07cee22bab1f..429daf2111050 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.{Expression, NumericHelper}
 import pipes.QueryState
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunction.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunction.scala
index 05104eafcca1c..a4ae40523a538 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.{Expression, NumericHelper}
 import pipes.QueryState
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunction.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunction.scala
index 5772c3ddab8dc..00fa06ea2e392 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunction.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.TypeSafeMathSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.TypeSafeMathSupport
 import pipes.QueryState
 
 class SumFunction(val value: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/EndPoint.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/EndPoint.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/EndPoint.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/EndPoint.scala
index f05310cc2cfdc..d260afa1941f8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/EndPoint.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/EndPoint.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.PropertyContainer
 
 final case class EndPoint(name: String) extends Trail {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStep.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStep.scala
index cadcbaad2161b..0e4f7616e5bc9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStep.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{MutableMaps, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.{EntityNotFoundException, SemanticDirection}
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{MutableMaps, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.{EntityNotFoundException, SemanticDirection}
 import org.neo4j.graphdb._
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/GraphRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/GraphRelationship.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/GraphRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/GraphRelationship.scala
index eccc39ee3e9e6..efc8810b44e3b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/GraphRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/GraphRelationship.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
 import java.lang.IllegalArgumentException
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/History.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/History.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/History.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/History.scala
index 9b58c7ef401d8..fdc36deee537e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/History.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/History.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import org.neo4j.graphdb.{Relationship, Node}
 import collection.Set
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingContext.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingContext.scala
index 835c297159986..e96d670bccf31 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingContext.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import collection.immutable
 
 /**
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingPair.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingPair.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingPair.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingPair.scala
index e045d9bbb639e..c78a50160d912 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/MatchingPair.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/MatchingPair.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
 import org.neo4j.graphdb.{Relationship, Node}
 import collection.Map
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
 
 case class MatchingPair(patternElement: PatternElement, entity: Any) {
   def matches(x: Any) = x == entity || x == patternElement || entity == x || patternElement == x
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternElement.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternElement.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternElement.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternElement.scala
index 748b8aeb1084a..8ac584b489b31 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternElement.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternElement.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
 abstract class PatternElement(val key: String) {
   def traverse[T](shouldFollow: (PatternElement) => Boolean,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternGraph.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternGraph.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternGraph.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternGraph.scala
index a42a79e73efd1..dcc69ee4be700 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternGraph.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternGraph.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Pattern, RelatedTo}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, ReadsRelationshipsWithTypes}
-import org.neo4j.cypher.internal.frontend.v3_0.PatternException
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Pattern, RelatedTo}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, ReadsRelationshipsWithTypes}
+import org.neo4j.cypher.internal.frontend.v3_1.PatternException
 
 case class PatternGraph(patternNodes: Map[String, PatternNode],
                         patternRels: Map[String, PatternRelationship],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatcher.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatcher.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatcher.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatcher.scala
index 51828954f5e7b..d5bc3f40719eb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatcher.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatcher.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
 import pipes.QueryState
 import org.neo4j.graphdb.{Relationship, Node}
 import collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatchingBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatchingBuilder.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatchingBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatchingBuilder.scala
index 82d7ec207ad08..34216196f04dc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternMatchingBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternMatchingBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{INCOMING, OUTGOING, BOTH}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{INCOMING, OUTGOING, BOTH}
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternNode.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternNode.scala
index c4b10f0e7b9b3..31eb4d47ee57c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternNode.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{RelatedTo, SingleNode}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{RelatedTo, SingleNode}
 import commands.expressions.Expression
 import commands.values.{UnresolvedProperty, KeyToken}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import pipes.QueryState
 import spi.QueryContext
 import org.neo4j.graphdb.Node
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationship.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationship.scala
index 80c4c86551d92..ccd69e30808ed 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationship.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyTypes, QueryState}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyTypes, QueryState}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Path, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SimplePatternMatcherBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SimplePatternMatcherBuilder.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SimplePatternMatcherBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SimplePatternMatcherBuilder.scala
index 4282847f171ed..11c558e28d19b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SimplePatternMatcherBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SimplePatternMatcherBuilder.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.DirectionConverter._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.DirectionConverter._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
 import org.neo4j.graphdb.{Node, Relationship, RelationshipType}
 import org.neo4j.graphmatching.{PatternMatch, PatternMatcher => SimplePatternMatcher, PatternNode => SimplePatternNode, PatternRelationship => SimplePatternRelationship}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStep.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStep.scala
index 811a6be543207..f6f6062c00053 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStep.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
 import SingleStep.FilteringIterator
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{True, And, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.DynamicIterable
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyTypes, QueryState}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{True, And, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.DynamicIterable
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyTypes, QueryState}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Node, Relationship}
 
 case class SingleStep(id: Int,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStepTrail.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStepTrail.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStepTrail.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStepTrail.scala
index 6672c07214169..ae87cf15f7238 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SingleStepTrail.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/SingleStepTrail.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{PropertyContainer}
 
 final case class SingleStepTrail(next: Trail,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/Trail.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/Trail.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/Trail.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/Trail.scala
index efe38da36b114..775c0ac89c197 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/Trail.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/Trail.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
 import org.neo4j.graphdb.PropertyContainer
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.Pattern
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.Pattern
 
 /**
  * A Trail is a intermediate data structure used by TraversalMatcher to produce the ExpanderSteps -> toSteps(..)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalMatcher.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalMatcher.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalMatcher.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalMatcher.scala
index b0d5c76f6b48f..69a83d5401401 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalMatcher.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalMatcher.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
 import pipes.QueryState
 import org.neo4j.graphdb.Path
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalPathExpander.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalPathExpander.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalPathExpander.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalPathExpander.scala
index 020518fe8e25a..a3a5f84187432 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/TraversalPathExpander.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/TraversalPathExpander.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.DynamicJavaIterable
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.DynamicJavaIterable
 import pipes.QueryState
 import org.neo4j.graphdb.{Relationship, Path, PathExpander}
 import org.neo4j.graphdb.traversal.BranchState
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VarLengthStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VarLengthStep.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VarLengthStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VarLengthStep.scala
index 67e60a2d23ea6..a8c2eb2337ee0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VarLengthStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VarLengthStep.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.DynamicIterable
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyTypes, QueryState}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.DynamicIterable
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyTypes, QueryState}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Node, Relationship}
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthStepTrail.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthStepTrail.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthStepTrail.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthStepTrail.scala
index d504063dffceb..97e52f42a5c37 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthStepTrail.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthStepTrail.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.Pattern
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.MutableMaps
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.Pattern
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.MutableMaps
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 final case class VariableLengthStepTrail(next: Trail,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescription.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescription.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescription.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescription.scala
index 684e787b357e2..6b50f6e504e56 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescription.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescription.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyLabel, LazyTypes, SeekArgs => PipeEntityByIdRhs}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QualifiedProcedureName
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyLabel, LazyTypes, SeekArgs => PipeEntityByIdRhs}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QualifiedProcedureName
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
 
 /**
  * Abstract description of an execution plan
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializer.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializer.scala
index 2000e059d28c7..f93129c5a487a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializer.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyTypes
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyTypes
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 
 object PlanDescriptionArgumentSerializer {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderAsTreeTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderAsTreeTable.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderAsTreeTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderAsTreeTable.scala
index c1facf5c33b50..2d927b9627016 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderAsTreeTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderAsTreeTable.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
 
 import scala.Predef
 import scala.collection.{Map, mutable}
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderSummary.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderSummary.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderSummary.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderSummary.scala
index 460b6a5ffc5c4..d4b17432fba06 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/renderSummary.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/renderSummary.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
 object renderSummary extends (InternalPlanDescription => String) {
   def apply(plan: InternalPlanDescription): String =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantCompileQueryException.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantCompileQueryException.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantCompileQueryException.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantCompileQueryException.scala
index c705f3872bbc7..0f7b0a491e82a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantCompileQueryException.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantCompileQueryException.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
-import org.neo4j.cypher.internal.frontend.v3_0.spi.MapToPublicExceptions
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
+import org.neo4j.cypher.internal.frontend.v3_1.spi.MapToPublicExceptions
 import org.neo4j.kernel.api.exceptions.Status
 
 class CantCompileQueryException(message: String = "Internal error - should have used fall back to execute query, but something went horribly wrong", cause:Throwable=null)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantHandleQueryException.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantHandleQueryException.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantHandleQueryException.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantHandleQueryException.scala
index 825a362a19f8a..4ada33cc46efd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CantHandleQueryException.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CantHandleQueryException.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
-import org.neo4j.cypher.internal.frontend.v3_0.spi.MapToPublicExceptions
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
+import org.neo4j.cypher.internal.frontend.v3_1.spi.MapToPublicExceptions
 import org.neo4j.kernel.api.exceptions.Status
 
 class CantHandleQueryException(message: String = "Internal error - should have used fall back to execute query, but something went horribly wrong")
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedExecutablePlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedExecutablePlanBuilder.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedExecutablePlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedExecutablePlanBuilder.scala
index dd18a916b72ee..757a7ca4d34b5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedExecutablePlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedExecutablePlanBuilder.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
-
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.conditions.containsNamedPathOnlyForShortestPath
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutablePlanBuilder, NewRuntimeSuccessRateMonitor, PlanFingerprint, PlanFingerprintReference}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.closing
-import org.neo4j.cypher.internal.compiler.v3_0.planner.execution.PipeExecutionBuilderContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.{ApplyRewriter, RewriterCondition, RewriterStep, RewriterStepSequencer}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, Scope, SemanticTable}
+package org.neo4j.cypher.internal.compiler.v3_1.planner
+
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.conditions.containsNamedPathOnlyForShortestPath
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutablePlanBuilder, NewRuntimeSuccessRateMonitor, PlanFingerprint, PlanFingerprintReference}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.closing
+import org.neo4j.cypher.internal.compiler.v3_1.planner.execution.PipeExecutionBuilderContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.{ApplyRewriter, RewriterCondition, RewriterStep, RewriterStepSequencer}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, Scope, SemanticTable}
 
 import scala.util.Try
 
@@ -103,7 +103,7 @@ case class CostBasedExecutablePlanBuilder(monitors: Monitors,
 }
 
 object CostBasedExecutablePlanBuilder {
-  import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStep._
+  import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStep._
 
   def rewriteStatement(statement: Statement,
                        scopeTree: Scope,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedPipeBuilderFactory.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedPipeBuilderFactory.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedPipeBuilderFactory.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedPipeBuilderFactory.scala
index d61b8a9b66834..0691447be6ce0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CostBasedPipeBuilderFactory.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CostBasedPipeBuilderFactory.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp._
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp._
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 object CostBasedPipeBuilderFactory {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CreatesPropertyKeys.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CreatesPropertyKeys.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CreatesPropertyKeys.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CreatesPropertyKeys.scala
index cb3409aa3e815..540402ea0006d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CreatesPropertyKeys.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CreatesPropertyKeys.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, MapExpression, PropertyKeyName}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, MapExpression, PropertyKeyName}
 
 /*
  * Used to simplify finding overlap between writing and reading properties
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/MutatingPattern.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/MutatingPattern.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/MutatingPattern.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/MutatingPattern.scala
index 4eff5193fe599..97e8919ae0ad3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/MutatingPattern.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/MutatingPattern.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, LabelName, PropertyKeyName, RelTypeName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, LabelName, PropertyKeyName, RelTypeName}
 
 sealed trait MutatingPattern {
   def coveredIds: Set[IdName]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQuery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQuery.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQuery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQuery.scala
index d4f0c48f96ff2..29c54a3c2430a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQuery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQuery.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, StrictnessMode}
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{PeriodicCommitHint, Hint, LabelName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, StrictnessMode}
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{PeriodicCommitHint, Hint, LabelName}
 
 import scala.annotation.tailrec
 import scala.collection.GenTraversableOnce
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraph.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraph.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraph.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraph.scala
index b3a5f88355ab9..e4443d4970a74 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraph.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraph.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 import scala.collection.{GenTraversableOnce, mutable}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryProjection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryProjection.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryProjection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryProjection.scala
index fc9e1f9e6182d..5517e47ce00b0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryProjection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryProjection.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.CSVFormat
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{EagerMode, IdName, LazyMode, StrictnessMode}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.ProcedureReadOnlyAccess
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+package org.neo4j.cypher.internal.compiler.v3_1.planner
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.CSVFormat
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{EagerMode, IdName, LazyMode, StrictnessMode}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.ProcedureReadOnlyAccess
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 sealed trait QueryHorizon {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/Selections.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/Selections.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/Selections.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/Selections.scala
index 87b1b30eef60e..832a75f6eb4da 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/Selections.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/Selections.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 case class Predicate(dependencies: Set[IdName], expr: Expression) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolver.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolver.scala
index 096bc506edf78..e7f27c8d75bcd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolver.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Query
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, PropertyKeyId, RelTypeId, LabelId}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Query
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, PropertyKeyId, RelTypeId, LabelId}
 
 class SimpleTokenResolver {
   def resolve(ast: Query)(implicit semanticTable: SemanticTable, tokenContext: TokenContext) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraph.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraph.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraph.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraph.scala
index f37a6d9f7cf1c..4142a419218d9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraph.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraph.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{PatternRelationship, IdName}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{PatternRelationship, IdName}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/checkForUnresolvedTokens.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/checkForUnresolvedTokens.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/checkForUnresolvedTokens.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/checkForUnresolvedTokens.scala
index 39c27297a1663..075bc615bc00e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/checkForUnresolvedTokens.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/checkForUnresolvedTokens.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{MissingPropertyNameNotification, MissingRelTypeNotification, MissingLabelNotification, InternalNotification}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{MissingPropertyNameNotification, MissingRelTypeNotification, MissingLabelNotification, InternalNotification}
 
 /**
   * Parses ast and looks for unresolved tokens
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionBuilderContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionBuilderContext.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionBuilderContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionBuilderContext.scala
index c89e936410e9f..2626929fe7edf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionBuilderContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionBuilderContext.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.execution
+package org.neo4j.cypher.internal.compiler.v3_1.planner.execution
 
-import org.neo4j.cypher.internal.compiler.v3_0.PlannerName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.PlannerName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class PipeExecutionBuilderContext(cardinality: Metrics.CardinalityModel, semanticTable: SemanticTable,
                                        plannerName: PlannerName)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilder.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilder.scala
index d1907594b4b48..3620d0434b6ef 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilder.scala
@@ -17,27 +17,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.execution
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.projectNamedPaths
-import org.neo4j.cypher.internal.compiler.v3_0.commands.EntityProducerFactory
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{AggregationExpression, Expression => CommandExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{True, _}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.prepare.KeyTokenResolver
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CantHandleQueryException, PeriodicCommit, logical}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InstrumentedGraphStatistics, PlanContext}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionContext, Monitors, ast => compilerAst, pipes}
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+package org.neo4j.cypher.internal.compiler.v3_1.planner.execution
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.projectNamedPaths
+import org.neo4j.cypher.internal.compiler.v3_1.commands.EntityProducerFactory
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{AggregationExpression, Expression => CommandExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{True, _}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.prepare.KeyTokenResolver
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CantHandleQueryException, PeriodicCommit, logical}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InstrumentedGraphStatistics, PlanContext}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionContext, Monitors, ast => compilerAst, pipes}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 import org.neo4j.graphdb.Relationship
 import org.neo4j.helpers.Clock
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CachedMetricsFactory.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CachedMetricsFactory.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CachedMetricsFactory.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CachedMetricsFactory.scala
index d7ab339fc40b1..2cba37153530e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CachedMetricsFactory.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CachedMetricsFactory.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CachedFunction
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{QueryGraphCardinalityModel, CardinalityModel}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CachedFunction
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{QueryGraphCardinalityModel, CardinalityModel}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
 
 case class CachedMetricsFactory(metricsFactory: MetricsFactory) extends MetricsFactory {
   def newCardinalityEstimator(queryGraphCardinalityModel: QueryGraphCardinalityModel): CardinalityModel =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModel.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModel.scala
index 25b08deaff0fb..f544e61040f51 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModel.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{HasLabels, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{HasLabels, Property}
 
 object CardinalityCostModel extends CostModel {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Eagerness.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Eagerness.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Eagerness.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Eagerness.scala
index 6e8ec187f852c..1adc4df0ad6cd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Eagerness.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Eagerness.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{PlannerQuery, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{PlannerQuery, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlannerIterable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlannerIterable.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlannerIterable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlannerIterable.scala
index 93501824dfe54..cb845c1f695ab 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlannerIterable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlannerIterable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
 
 trait LeafPlannerIterable {
   def candidates(qg: QueryGraph, f: (LogicalPlan, QueryGraph) => LogicalPlan = (plan, _) => plan )(implicit context: LogicalPlanningContext): Iterable[Seq[LogicalPlan]]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescription.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescription.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescription.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescription.scala
index d52f37f8e7e7a..e34d99987a4cf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescription.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescription.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
 
 object LogicalPlan2PlanDescription extends ((LogicalPlan, Map[LogicalPlan, Id]) => InternalPlanDescription) {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilder.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilder.scala
index e2ce1200a0562..9e9d2a19d1da4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilder.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.frontend.v3_0.IdentityMap
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.frontend.v3_1.IdentityMap
 
 /*
 The map of logical plan and ids is used to allow profiling to connect to the right part in the logical plan
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningContext.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningContext.scala
index 1d60303398381..f9fc00f9a686e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningContext.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.{devNullLogger, InternalNotificationLogger}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, StrictnessMode}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.{devNullLogger, InternalNotificationLogger}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, StrictnessMode}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class LogicalPlanningContext(planContext: PlanContext,
                                   logicalPlanProducer: LogicalPlanProducer,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningFunction.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningFunction.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningFunction.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningFunction.scala
index 5e0d19f0d32b7..1680e992f2966 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningFunction.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningFunction.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 trait LogicalPlanningFunction0[+B] {
   def apply(implicit context: LogicalPlanningContext): B
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningSupport.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningSupport.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningSupport.scala
index 41c1153f3920f..f53cb68603b7b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanningSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanningSupport.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Hint
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Hint
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
 
 object LogicalPlanningSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Metrics.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Metrics.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Metrics.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Metrics.scala
index 1aba5d63a3d47..70f0a0f447c49 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Metrics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Metrics.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.MapSupport._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{QueryGraphCardinalityModel, CardinalityModel, CostModel}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{StrictnessMode, IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{PlannerQuery, QueryGraph}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.MapSupport._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{QueryGraphCardinalityModel, CardinalityModel, CostModel}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{StrictnessMode, IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{PlannerQuery, QueryGraph}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 import scala.language.implicitConversions
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamer.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamer.scala
index 59f76bd444de4..576d544f237e1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamer.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.UnNamedNameGenerator
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{IdentityMap, Rewriter, topDown}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.UnNamedNameGenerator
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{IdentityMap, Rewriter, topDown}
 
 object PatternExpressionPatternElementNamer {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizon.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizon.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizon.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizon.scala
index 91dff00475bf3..f0dffba969874 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizon.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizon.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{aggregation, projection, sortSkipAndLimit}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{aggregation, projection, sortSkipAndLimit}
 
 /*
 Planning event horizons means planning the WITH clauses between query patterns. Some of these clauses are inlined
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanSingleQuery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanSingleQuery.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanSingleQuery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanSingleQuery.scala
index f9c4a7fb10ef6..4148953b6bdc7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanSingleQuery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanSingleQuery.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.PlannerQuery
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{countStorePlanner, verifyBestPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.PlannerQuery
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{countStorePlanner, verifyBestPlan}
 
 /*
 This coordinates PlannerQuery planning and delegates work to the classes that do the actual planning of
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanUpdates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanUpdates.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanUpdates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanUpdates.scala
index 4d119f79e1f61..b1ef1305654c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanUpdates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanUpdates.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.mergeUniqueIndexSeekLeafPlanner
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ContainerIndex, PathExpression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.mergeUniqueIndexSeekLeafPlanner
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ContainerIndex, PathExpression, Variable}
 
 /*
  * This coordinates PlannerQuery planning of updates.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanWithTail.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanWithTail.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanWithTail.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanWithTail.scala
index 69f5ab2a80929..7804cdf519bcb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanWithTail.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanWithTail.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.PlannerQuery
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.PlannerQuery
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 /*
 This class ties together disparate query graphs through their event horizons. It does so by using Apply,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ProjectingSelector.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ProjectingSelector.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ProjectingSelector.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ProjectingSelector.scala
index b8fff82ec842c..a50a73e8c42e3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ProjectingSelector.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ProjectingSelector.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 trait ProjectingSelector[P] {
   def apply(plans: Iterable[P]): Option[P] = apply[P](identity, plans)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphSolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphSolver.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphSolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphSolver.scala
index 9270eeb17bc0e..71ce8f7148709 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphSolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphSolver.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{NodePattern, PatternExpression, RelationshipChain}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{NodePattern, PatternExpression, RelationshipChain}
 
 trait QueryGraphSolver {
   def plan(queryGraph: QueryGraph)(implicit context: LogicalPlanningContext, leafPlan: Option[LogicalPlan] = None): LogicalPlan
@@ -33,7 +33,7 @@ trait PatternExpressionSolving {
 
   self: QueryGraphSolver =>
 
-  import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
+  import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
 
   def planPatternExpression(planArguments: Set[IdName], expr: PatternExpression)(implicit context: LogicalPlanningContext): (LogicalPlan, PatternExpression) = {
     val dependencies = expr.dependencies.map(IdName.fromVariable)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlanner.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlanner.scala
index adad62608e0d4..03b79ff0f8b01 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlanner.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{LogicalPlan, ProduceResult}
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{LogicalPlan, ProduceResult}
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
 
 trait QueryPlanner {
   def plan(plannerQuery: UnionQuery)(implicit context: LogicalPlanningContext): (Option[PeriodicCommit], LogicalPlan)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlannerConfiguration.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlannerConfiguration.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlannerConfiguration.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlannerConfiguration.scala
index ee9167f202182..15192079d33eb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryPlannerConfiguration.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryPlannerConfiguration.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.solveOptionalMatches.OptionalSolver
-import org.neo4j.cypher.internal.compiler.v3_0.{UpdateStrategy, defaultUpdateStrategy}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.solveOptionalMatches.OptionalSolver
+import org.neo4j.cypher.internal.compiler.v3_1.{UpdateStrategy, defaultUpdateStrategy}
 
 object QueryPlannerConfiguration {
   val default: QueryPlannerConfiguration = QueryPlannerConfiguration(
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SimpleMetricsFactory.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SimpleMetricsFactory.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SimpleMetricsFactory.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SimpleMetricsFactory.scala
index 45a3efb8b39b0..3a9b48eb113d1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SimpleMetricsFactory.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SimpleMetricsFactory.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.QueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.QueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
 
 object SimpleMetricsFactory extends MetricsFactory {
   def newCostModel(): CostModel = CardinalityCostModel
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Solvable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Solvable.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Solvable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Solvable.scala
index 139404b629788..e3b2eafce3e52 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/Solvable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/Solvable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.PatternRelationship
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.PatternRelationship
 
 sealed trait Solvable {
   def solvables: Set[SolvableLeaf]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SortDescription.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SortDescription.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SortDescription.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SortDescription.scala
index 2f1ff49404410..0fdabc291af5b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SortDescription.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SortDescription.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
 
 sealed trait SortDescription {
   def id: IdName
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModel.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModel.scala
index d57a01e45c527..5d093ada7a343 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModel.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.MapSupport._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.simpleExpressionEvaluator
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{CardinalityModel, QueryGraphCardinalityModel, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast.IntegerLiteral
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality.lift
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.MapSupport._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.simpleExpressionEvaluator
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{CardinalityModel, QueryGraphCardinalityModel, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast.IntegerLiteral
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality.lift
 
 class StatisticsBackedCardinalityModel(queryGraphCardinalityModel: QueryGraphCardinalityModel) extends CardinalityModel {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculator.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculator.scala
index aad954fd6cbf9..9e37f5c5eab49 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculator.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
 import java.math
 import java.math.RoundingMode
 
-import org.neo4j.cypher.internal.compiler.v3_0.PrefixRange
-import org.neo4j.cypher.internal.compiler.v3_0.planner.Selections
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.PrefixRange
+import org.neo4j.cypher.internal.compiler.v3_1.planner.Selections
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, SemanticTable}
 
 trait Expression2Selectivity {
   def apply(exp: Expression)(implicit semanticTable: SemanticTable, selections: Selections): Selectivity
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimator.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimator.scala
index 5613e416d8569..0e04d754d35cf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimator.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, cardinality}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, cardinality}
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/QueryGraphCardinalityModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/QueryGraphCardinalityModel.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/QueryGraphCardinalityModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/QueryGraphCardinalityModel.scala
index f3b184441c15a..ac9272f067608 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/QueryGraphCardinalityModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/QueryGraphCardinalityModel.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence.AssumeIndependenceQueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence.AssumeIndependenceQueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
 
 object QueryGraphCardinalityModel {
   def default(statistics: GraphStatistics): QueryGraphCardinalityModel =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombiner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombiner.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombiner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombiner.scala
index 540f180c61c40..13143292f2306 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombiner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombiner.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
 import java.math
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Selectivity
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Selectivity
 
 trait SelectivityCombiner {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityEstimator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityEstimator.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityEstimator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityEstimator.scala
index 3289cdadaa3dd..591ebb0519f31 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityEstimator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityEstimator.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Selectivity
-import org.neo4j.cypher.internal.compiler.v3_0.planner.Selections
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Selectivity
+import org.neo4j.cypher.internal.compiler.v3_1.planner.Selections
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 trait SelectivityEstimator extends (Expression => Selectivity) {
   self: SelectivityEstimator =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/TokenSpec.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/TokenSpec.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/TokenSpec.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/TokenSpec.scala
index e6d71d299b3e3..76cdbabf4c2b7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/TokenSpec.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/TokenSpec.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SymbolicNameWithId
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SymbolicNameWithId
 
 sealed trait TokenSpec[+ID <: NameId] {
   def id: Option[ID]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala
index 583d9442041f1..2d2bb88e0c46a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModel.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence
-
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{ExpressionSelectivityCalculator, SelectivityCombiner}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, SimplePatternLength, VarPatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence
+
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{ExpressionSelectivityCalculator, SelectivityCombiner}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, SimplePatternLength, VarPatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class AssumeIndependenceQueryGraphCardinalityModel(stats: GraphStatistics, combiner: SelectivityCombiner)
   extends QueryGraphCardinalityModel {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala
index 4e3278ef6b851..05792b162be5a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculator.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.Selections
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelName, RelTypeName}
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.Selections
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelName, RelTypeName}
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 trait Pattern2Selectivity {
   def apply(pattern: PatternRelationship, labels: Map[IdName, Set[LabelName]])(implicit semanticTable: SemanticTable, selections: Selections): Selectivity
@@ -37,7 +37,7 @@ object PatternSelectivityCalculator {
 
 case class PatternSelectivityCalculator(stats: GraphStatistics, combiner: SelectivityCombiner) extends Pattern2Selectivity {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence.PatternSelectivityCalculator._
+  import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence.PatternSelectivityCalculator._
 
   def apply(pattern: PatternRelationship, labels: Map[IdName, Set[LabelName]])
            (implicit semanticTable: SemanticTable, selections: Selections): Selectivity = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala
index 756a478c6b3a0..f902d7ff66d15 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/optional/OptionalQueryGraphCardinalityModel.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.optional
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.optional
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class OptionalQueryGraphCardinalityModel(inner: QueryGraphCardinalityModel) extends QueryGraphCardinalityModel {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala
index 46533c1e71be5..9ac893fbfc1f6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimator.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{Unspecified, TokenSpec}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, VarPatternLength, SimplePatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Multiplier}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.RelTypeId
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{Unspecified, TokenSpec}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, VarPatternLength, SimplePatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Multiplier}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.RelTypeId
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/Triplet.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/Triplet.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/Triplet.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/Triplet.scala
index dd2d42a09bffd..18984847c99ea 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/Triplet.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/Triplet.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Multiplier
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.TokenSpec
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternLength, SimplePatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Multiplier
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.TokenSpec
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternLength, SimplePatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, RelTypeId}
 
 case class Triplet(name: IdName,
                    left: IdName, leftLabels: Set[TokenSpec[LabelId]],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverter.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverter.scala
index 56c7aa7cb7b5c..6d2f29d427f61 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverter.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelName, RelTypeName}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{LabelInfo, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.TokenSpec
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.TokenSpec.{LabelSpecs, RelTypeSpecs}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{QueryGraph, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SemanticTable, RelTypeId, LabelId}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelName, RelTypeName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{LabelInfo, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.TokenSpec
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.TokenSpec.{LabelSpecs, RelTypeSpecs}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{QueryGraph, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SemanticTable, RelTypeId, LabelId}
 
 case class TripletConverter(qg: QueryGraph, input: QueryGraphSolverInput, semanticTable: SemanticTable)
   extends (PatternRelationship => Triplet) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala
index 19ed96f843e67..5fbf7b98aa4c1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModel.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
-
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{ExpressionSelectivityEstimator, NodeCardinalityEstimator, SelectivityCombiner}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
+
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{ExpressionSelectivityEstimator, NodeCardinalityEstimator, SelectivityCombiner}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 object TripletQueryGraphCardinalityModel {
   type SelectivityEstimator = Expression => Selectivity
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala
index c6cb58802f38a..39bbbec0650a2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/calculateOverlapCardinality.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{PatternRelationship, IdName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{PatternRelationship, IdName}
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/AdaptiveSolverStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/AdaptiveSolverStep.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/AdaptiveSolverStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/AdaptiveSolverStep.scala
index 3a7691b7f37f9..9bb1a2b19a25f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/AdaptiveSolverStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/AdaptiveSolverStep.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{LogicalPlan, PatternRelationship}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{LogicalPlan, PatternRelationship}
 
 case class AdaptiveSolverStep(qg: QueryGraph, patternLengthThreshold: Int) extends IDPSolverStep[PatternRelationship, LogicalPlan, LogicalPlanningContext] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPCache.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPCache.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPCache.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPCache.scala
index dc1c10e38fa7a..9186933878aac 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPCache.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPCache.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 // Read-only interface to IDPTable
 //
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPPlanTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPPlanTable.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPPlanTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPPlanTable.scala
index 79b72c76c5ddf..4b0e1535814fd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPPlanTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPPlanTable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Solvable
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Solvable
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 import scala.collection.{Map, mutable}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolver.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolver.scala
index 3630e85da7176..af3bfef853eae 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolver.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.planShortestPaths
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.planShortestPaths
 import scala.annotation.tailrec
 
 trait IDPQueryGraphSolverMonitor extends IDPSolverMonitor {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolver.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolver.scala
index 78d7b793e0ff8..43db7b209a8c5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolver.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.LazyIterable
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{ProjectingSelector, Selector}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.LazyIterable
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{ProjectingSelector, Selector}
 
 import scala.collection.immutable.BitSet
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverConfig.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverConfig.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverConfig.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverConfig.scala
index bb838279c36de..374c95f7d030e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverConfig.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverConfig.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{PatternRelationship, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{PatternRelationship, LogicalPlan}
 
 /**
  * The IDP inner loop can be optimized and tweaked in several ways, and this trait encapsulates those settings
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverStep.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverStep.scala
index 6182041d88c8e..cb4cfab25c3a2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverStep.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 object IDPSolverStep {
   def empty[S, P, C] = new IDPSolverStep[S, P, C] {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTable.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTable.scala
index 64d002eb13023..bca8aaee1cc3f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTable.scala
@@ -36,7 +36,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IdRegistry.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IdRegistry.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IdRegistry.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IdRegistry.scala
index 8e56101f2f00c..bf41a5cad4344 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IdRegistry.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IdRegistry.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/SingleComponentPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/SingleComponentPlanner.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/SingleComponentPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/SingleComponentPlanner.scala
index bc3a5d1081676..80d0c10adfa8b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/SingleComponentPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/SingleComponentPlanner.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.IteratorSupport._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.expandSolverStep.{planSinglePatternSide, planSingleProjectEndpoints}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.solveOptionalMatches.OptionalSolver
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{applyOptional, leafPlanOptions, outerHashJoin}
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.IteratorSupport._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.expandSolverStep.{planSinglePatternSide, planSingleProjectEndpoints}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.solveOptionalMatches.OptionalSolver
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{applyOptional, leafPlanOptions, outerHashJoin}
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 /**
   * This class contains the main IDP loop in the cost planner.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/cartesianProductsOrValueJoins.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/cartesianProductsOrValueJoins.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/cartesianProductsOrValueJoins.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/cartesianProductsOrValueJoins.scala
index 04e52cbb05e80..0e60905f83298 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/cartesianProductsOrValueJoins.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/cartesianProductsOrValueJoins.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{LogicalPlan, IndexLeafPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, QueryPlannerKit}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{LogicalPlan, IndexLeafPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, QueryPlannerKit}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 
 trait JoinDisconnectedQueryGraphComponents {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/expandSolverStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/expandSolverStep.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/expandSolverStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/expandSolverStep.scala
index 432dc7f237894..8a53c9542b77e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/expandSolverStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/expandSolverStep.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AllIterablePredicate, FilterScope, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AllIterablePredicate, FilterScope, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
 
 case class expandSolverStep(qg: QueryGraph) extends IDPSolverStep[PatternRelationship, LogicalPlan, LogicalPlanningContext] {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.expandSolverStep._
+  import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.expandSolverStep._
 
   override def apply(registry: IdRegistry[PatternRelationship], goal: Goal, table: IDPCache[LogicalPlan])
                     (implicit context: LogicalPlanningContext): Iterator[LogicalPlan] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/joinSolverStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/joinSolverStep.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/joinSolverStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/joinSolverStep.scala
index bbbec7a531413..042d51eddb7c7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/joinSolverStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/joinSolverStep.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.joinSolverStep._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, PatternRelationship}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, LogicalPlanningSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.joinSolverStep._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, PatternRelationship}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, LogicalPlanningSupport}
 
 object joinSolverStep {
   val VERBOSE = false
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/package.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/package.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/package.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/package.scala
index d159efa288364..05eebf8c406f7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/package.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/package.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 import scala.collection.immutable.BitSet
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/package.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/package.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/package.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/package.scala
index 85dc62b1ea0a6..29bdaadfae675 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/package.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/package.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 package object logical {
   type Selector[P] = Iterable[P] => Option[P]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriter.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriter.scala
index f7ad1cc9c429a..57bcbf38673be 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriter.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.NestedPlanExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, PatternExpression}
-import org.neo4j.cypher.internal.frontend.v3_0.{topDown, IdentityMap, Rewriter}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.NestedPlanExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, PatternExpression}
+import org.neo4j.cypher.internal.frontend.v3_1.{topDown, IdentityMap, Rewriter}
 
 // Rewrite pattern expressions to nested plan expressions by planning them using the given context
 case class patternExpressionRewriter(planArguments: Set[IdName], context: LogicalPlanningContext) extends Rewriter {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Aggregation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Aggregation.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Aggregation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Aggregation.scala
index 04f3a98d96b36..15132334ea4ab 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Aggregation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Aggregation.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class Aggregation(left: LogicalPlan,
                        groupingExpressions: Map[String, Expression],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesScan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesScan.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesScan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesScan.scala
index 3ee8884bfeb77..bb691f3241a7f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesScan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesScan.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class AllNodesScan(idName: IdName, argumentIds: Set[IdName])(val solved: PlannerQuery with CardinalityEstimation)
   extends NodeLogicalLeafPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AntiConditionalApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AntiConditionalApply.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AntiConditionalApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AntiConditionalApply.scala
index e5c2ab275ea69..ca27c22961762 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AntiConditionalApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AntiConditionalApply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class AntiConditionalApply(left: LogicalPlan, right: LogicalPlan, items: Seq[IdName])(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Apply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Apply.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Apply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Apply.scala
index 1934e2dfd07d0..8c2ec331aaa9e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Apply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Apply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Apply(left: LogicalPlan, right: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Argument.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Argument.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Argument.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Argument.scala
index 0754b301a5452..0ce4a8ba49d02 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Argument.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Argument.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 // Argument is used inside of an Apply to feed the row from the LHS of the Apply to the leaf of the RHS
 case class Argument(argumentIds: Set[IdName])(val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AssertSameNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AssertSameNode.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AssertSameNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AssertSameNode.scala
index 19579c0a5b7f5..613c0b35ba68b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AssertSameNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AssertSameNode.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class AssertSameNode(node: IdName, left: LogicalPlan, right: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CartesianProduct.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CartesianProduct.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CartesianProduct.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CartesianProduct.scala
index 812362efb796c..d7313666ab4ce 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CartesianProduct.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CartesianProduct.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 
 case class CartesianProduct(left: LogicalPlan, right: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ConditionalApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ConditionalApply.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ConditionalApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ConditionalApply.scala
index 4e7f5d5516b2b..94470acdd14ec 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ConditionalApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ConditionalApply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class ConditionalApply(left: LogicalPlan, right: LogicalPlan, items: Seq[IdName])(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateNode.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateNode.scala
index a44962c880268..056658afd134a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, LabelName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, LabelName}
 
 case class CreateNode(source: LogicalPlan, idName: IdName, labels: Seq[LabelName], properties: Option[Expression])
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateRelationship.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateRelationship.scala
index e58012699276c..b4bd83cc5abdd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/CreateRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/CreateRelationship.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, RelTypeName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, RelTypeName}
 
 case class CreateRelationship(source: LogicalPlan, idName: IdName, startNode: IdName, typ: RelTypeName, endNode: IdName,
                               properties: Option[Expression])
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteExpression.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteExpression.scala
index 30d38e125306c..7051f0917ff05 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DeleteExpression(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteNode.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteNode.scala
index 8557a42ec361c..2596a9a54fc10 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DeleteNode(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeletePath.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeletePath.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeletePath.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeletePath.scala
index abe947d230aa5..8d4b402f1555b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeletePath.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeletePath.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DeletePath(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteRelationship.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteRelationship.scala
index f985bbe9c86d4..3019b54ef794b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DeleteRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DeleteRelationship.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DeleteRelationship(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteExpression.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteExpression.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteExpression.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteExpression.scala
index ea37b2c872eda..7d8371e464c82 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteExpression.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DetachDeleteExpression(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteNode.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteNode.scala
index cfaec956783c4..f33ae84b66e54 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeleteNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeleteNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DetachDeleteNode(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeletePath.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeletePath.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeletePath.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeletePath.scala
index 45c6a562982fc..d9a70ee5ab8ad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DetachDeletePath.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DetachDeletePath.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class DetachDeletePath(source: LogicalPlan, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DirectedRelationshipByIdSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DirectedRelationshipByIdSeek.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DirectedRelationshipByIdSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DirectedRelationshipByIdSeek.scala
index 931fcd781cef1..b0d106cb5f184 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/DirectedRelationshipByIdSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/DirectedRelationshipByIdSeek.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class DirectedRelationshipByIdSeek(idName: IdName,
                                         relIds: SeekableArgs,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Eager.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Eager.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Eager.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Eager.scala
index 1595720292095..468a8969ce2f3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Eager.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Eager.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Eager(inner: LogicalPlan)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/EmptyResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/EmptyResult.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/EmptyResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/EmptyResult.scala
index e05386c624de4..eb65e52f0d6a5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/EmptyResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/EmptyResult.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class EmptyResult(inner: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ErrorPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ErrorPlan.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ErrorPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ErrorPlan.scala
index 05824ac5ba252..bd8a1b9a2c5c3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ErrorPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ErrorPlan.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class ErrorPlan(inner: LogicalPlan, exception: Exception)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Expand.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Expand.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Expand.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Expand.scala
index e336af79ea643..a5de967328649 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Expand.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Expand.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, RelTypeName, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, RelTypeName, Variable}
 
 sealed trait ExpansionMode
 case object ExpandAll extends ExpansionMode
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/FindShortestPaths.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/FindShortestPaths.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/FindShortestPaths.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/FindShortestPaths.scala
index 172322f0b1154..856d513fba02e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/FindShortestPaths.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/FindShortestPaths.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class FindShortestPaths(left: LogicalPlan, shortestPath: ShortestPathPattern, predicates: Seq[Expression] = Seq.empty)
                             (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ForeachApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ForeachApply.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ForeachApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ForeachApply.scala
index daa1eb6bcd849..b9c07c22546c0 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ForeachApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ForeachApply.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class ForeachApply(left: LogicalPlan, right: LogicalPlan, variable: String, expression: Expression)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LegacyIndexSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LegacyIndexSeek.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LegacyIndexSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LegacyIndexSeek.scala
index a527869262c3a..96f39da6530eb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LegacyIndexSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LegacyIndexSeek.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LegacyIndexHint
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LegacyIndexHint
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class LegacyIndexSeek(idName: IdName, hint: LegacyIndexHint, argumentIds: Set[IdName])
                           (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSelectOrSemiApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSelectOrSemiApply.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSelectOrSemiApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSelectOrSemiApply.scala
index 3b06a2f8d46ca..65beae5b1abd3 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSelectOrSemiApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSelectOrSemiApply.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class LetSelectOrSemiApply(left: LogicalPlan, right: LogicalPlan, idName: IdName, expr: Expression)
                                (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSemiApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSemiApply.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSemiApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSemiApply.scala
index 4cbdb93bd7d62..2025e2be1ebff 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LetSemiApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LetSemiApply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class LetSemiApply(left: LogicalPlan, right: LogicalPlan, idName: IdName)
                        (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Limit.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Limit.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Limit.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Limit.scala
index 118fa76352192..d7ed635f972ed 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Limit.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Limit.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Limit(left: LogicalPlan, count: Expression, ties: Ties)
                 (val solved: PlannerQuery with CardinalityEstimation) extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LoadCSV.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LoadCSV.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LoadCSV.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LoadCSV.scala
index f5642869f8220..0f8bf8f791122 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LoadCSV.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LoadCSV.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.CSVFormat
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.CSVFormat
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class LoadCSV(source: LogicalPlan,
                    url: Expression,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlan.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlan.scala
index 52172d068a90d..cb3648946d186 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlan.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 import java.lang.reflect.Method
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.QueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, Rewritable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.QueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, Rewritable}
 
 /*
 A LogicalPlan is an algebraic query, which is represented by a query tree whose leaves are database relations and
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateNode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateNode.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateNode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateNode.scala
index ad13f0007cd73..f62ca107539dd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateNode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, LabelName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, LabelName}
 
 case class MergeCreateNode(source: LogicalPlan, idName: IdName, labels: Seq[LabelName], properties: Option[Expression])
                           (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateRelationship.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateRelationship.scala
index 560e7cad6a47a..099b75a6b3e84 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/MergeCreateRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/MergeCreateRelationship.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyType
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyType
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class MergeCreateRelationship(source: LogicalPlan, idName: IdName, startNode: IdName, typ: LazyType, endNode: IdName,
                                    properties: Option[Expression])
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByIdSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByIdSeek.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByIdSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByIdSeek.scala
index 8b92e4005366d..3784a45af4a67 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByIdSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByIdSeek.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class NodeByIdSeek(idName: IdName, nodeIds: SeekableArgs, argumentIds: Set[IdName])
                        (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByLabelScan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByLabelScan.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByLabelScan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByLabelScan.scala
index 32f0302393338..a21f836c20909 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeByLabelScan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeByLabelScan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
 
 case class NodeByLabelScan(idName: IdName, label: LabelName, argumentIds: Set[IdName])
                           (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeCountFromCountStore.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeCountFromCountStore.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeCountFromCountStore.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeCountFromCountStore.scala
index 15662220e05a4..c8de2efd7f857 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeCountFromCountStore.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeCountFromCountStore.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
 
 
 case class NodeCountFromCountStore(idName: IdName, labelName: Option[LabelName], argumentIds: Set[IdName])
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeHashJoin.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeHashJoin.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeHashJoin.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeHashJoin.scala
index ae38b45d4372c..80f054c8bd461 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeHashJoin.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeHashJoin.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class NodeHashJoin(nodes: Set[IdName], left: LogicalPlan, right: LogicalPlan)
                        (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexContainsScan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexContainsScan.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexContainsScan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexContainsScan.scala
index 084bf8fba0fc4..ce3fa010bf2ac 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexContainsScan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexContainsScan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, PropertyKeyToken, LabelToken}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, PropertyKeyToken, LabelToken}
 
 /*
   * This operator does a full scan of an index, returning all entries that contain a string value
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexEndsWithScan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexEndsWithScan.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexEndsWithScan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexEndsWithScan.scala
index 45b9993eb89fe..69a4e3bc6ed9c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexEndsWithScan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexEndsWithScan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, LabelToken, PropertyKeyToken}
 
 /*
   * This operator does a full scan of an index, returning all entries that end with a string value
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexScan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexScan.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexScan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexScan.scala
index 60f6deebe36d9..9dd2f1360ec05 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexScan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexScan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelToken, PropertyKeyToken}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class NodeIndexScan(idName: IdName,
                          label: LabelToken,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexSeek.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexSeek.scala
index 87c5b477bc244..b585bef61a690 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeIndexSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeIndexSeek.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{PropertyKeyToken, LabelToken, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.QueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{PropertyKeyToken, LabelToken, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.QueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class NodeIndexSeek(idName: IdName,
                          label: LabelToken,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeUniqueIndexSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeUniqueIndexSeek.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeUniqueIndexSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeUniqueIndexSeek.scala
index 3cb936883bea3..99d407bc40371 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NodeUniqueIndexSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NodeUniqueIndexSeek.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.QueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, LabelToken, PropertyKeyToken}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.QueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, LabelToken, PropertyKeyToken}
 
 case class NodeUniqueIndexSeek(idName: IdName,
                                label: LabelToken,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NonSargable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NonSargable.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NonSargable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NonSargable.scala
index b248ee04cd5cb..e9606c8f6ee32 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/NonSargable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/NonSargable.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 // This is when dynamic properties are used
 object AsDynamicPropertyNonSeekable {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Optional.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Optional.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Optional.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Optional.scala
index b1b3db13ab648..a4375aecbfe99 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Optional.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Optional.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Optional(inputPlan: LogicalPlan, protectedSymbols: Set[IdName] = Set.empty)
                    (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/OuterHashJoin.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/OuterHashJoin.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/OuterHashJoin.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/OuterHashJoin.scala
index a44da07920693..265dda444de6a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/OuterHashJoin.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/OuterHashJoin.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class OuterHashJoin(nodes: Set[IdName], left: LogicalPlan, right: LogicalPlan)
                         (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/PatternRelationship.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/PatternRelationship.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/PatternRelationship.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/PatternRelationship.scala
index 36f0fc3579455..ca1d715ce8082 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/PatternRelationship.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/PatternRelationship.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.RelTypeName
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.RelTypeName
 
 final case class PatternRelationship(name: IdName, nodes: (IdName, IdName), dir: SemanticDirection,
                                      types: Seq[RelTypeName], length: PatternLength) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProcedureCall.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProcedureCall.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProcedureCall.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProcedureCall.scala
index ba608c4ce13de..c524597778e40 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProcedureCall.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProcedureCall.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class ProcedureCall(left: LogicalPlan, call: ResolvedCall)
                         (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProduceResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProduceResult.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProduceResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProduceResult.scala
index f03d97e08caa1..ffae29163a1aa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProduceResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProduceResult.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 case class ProduceResult(columns: Seq[String], inner: LogicalPlan) extends LogicalPlan {
   val lhs = Some(inner)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProjectEndpoints.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProjectEndpoints.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProjectEndpoints.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProjectEndpoints.scala
index bd1bf4472660d..b6895c752cecb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ProjectEndpoints.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ProjectEndpoints.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.RelTypeName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.RelTypeName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class ProjectEndpoints(left: LogicalPlan,
                             rel: IdName,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Projection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Projection.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Projection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Projection.scala
index 1ffae02b9f411..eeb1b909f333d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Projection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Projection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class Projection(left: LogicalPlan, expressions: Map[String, Expression])
                      (val solved: PlannerQuery with CardinalityEstimation) extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RelationshipCountFromCountStore.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RelationshipCountFromCountStore.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RelationshipCountFromCountStore.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RelationshipCountFromCountStore.scala
index 5166e01f72832..c9acafc016dad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RelationshipCountFromCountStore.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RelationshipCountFromCountStore.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyTypes
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyTypes
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
 
 case class RelationshipCountFromCountStore(idName: IdName, startLabel: Option[LabelName],
                                            typeNames: LazyTypes, endLabel: Option[LabelName], bothDirections: Boolean,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RemoveLabels.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RemoveLabels.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RemoveLabels.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RemoveLabels.scala
index 7b49d26120095..acd34f70871ef 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RemoveLabels.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RemoveLabels.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
 
 case class RemoveLabels(source: LogicalPlan, idName: IdName, labelNames: Seq[LabelName])
                     (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RepeatableRead.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RepeatableRead.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RepeatableRead.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RepeatableRead.scala
index 5263197016e0a..22e03417db0ae 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RepeatableRead.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RepeatableRead.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 /*
  * Repeatable reads are enforcing that the encapsulated logical plan is only read once within a query execution.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RollUpApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RollUpApply.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RollUpApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RollUpApply.scala
index a7e3b9714efbc..03880be025277 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/RollUpApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/RollUpApply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 /*
 RollUp is the inverse of the Unwind operator. For each row passed in from the LHS, the whole RHS is executed.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sargable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sargable.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sargable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sargable.scala
index b32ad525b604c..f3a3b7d15c7c4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sargable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sargable.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.{InequalitySeekRangeWrapper, PrefixSeekRangeWrapper}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ManySeekArgs, SeekArgs, SingleSeekArg}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.{InequalitySeekRangeWrapper, PrefixSeekRangeWrapper}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ManySeekArgs, SeekArgs, SingleSeekArg}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound}
 
 object WithSeekableArgs {
   def unapply(v: Any) = v match {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SeekRhs.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SeekRhs.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SeekRhs.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SeekRhs.scala
index c451783935109..cd6bacfaee2c5 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SeekRhs.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SeekRhs.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ManyQueryExpression, QueryExpression, SingleQueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ManySeekArgs, SeekArgs}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ManyQueryExpression, QueryExpression, SingleQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ManySeekArgs, SeekArgs}
 
 object Seek {
   def unapply(v: Any) = v match {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SelectOrSemiApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SelectOrSemiApply.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SelectOrSemiApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SelectOrSemiApply.scala
index 341acdb63e067..bdc7e6c7f34d8 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SelectOrSemiApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SelectOrSemiApply.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class SelectOrSemiApply(left: LogicalPlan, right: LogicalPlan, expr: Expression)
                             (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Selection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Selection.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Selection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Selection.scala
index 4cdb7d4388f73..07d6b82029bcf 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Selection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Selection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Selection(predicates: Seq[Expression], left: LogicalPlan)
                     (val solved: PlannerQuery with CardinalityEstimation) extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SemiApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SemiApply.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SemiApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SemiApply.scala
index abfee953ce56f..134457165f50e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SemiApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SemiApply.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class SemiApply(left: LogicalPlan, right: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
   extends AbstractSemiApply(left, right, solved)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetLabels.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetLabels.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetLabels.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetLabels.scala
index 2fb99a3a616ae..9ded29f9a5a7a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetLabels.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetLabels.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
 
 case class SetLabels(source: LogicalPlan, idName: IdName, labelNames: Seq[LabelName])
                     (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodePropertiesFromMap.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodePropertiesFromMap.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodePropertiesFromMap.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodePropertiesFromMap.scala
index d78118f49b9a3..203bcc1812869 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodePropertiesFromMap.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodePropertiesFromMap.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class SetNodePropertiesFromMap(source: LogicalPlan, idName: IdName, expression: Expression, removeOtherProps: Boolean)
                     (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodeProperty.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodeProperty.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodeProperty.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodeProperty.scala
index 9d516a931569a..a4ff9324a60ba 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetNodeProperty.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetNodeProperty.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, PropertyKeyName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, PropertyKeyName}
 
 case class SetNodeProperty(source: LogicalPlan, idName: IdName, propertyKey: PropertyKeyName,
                            value: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropertiesFromMap.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropertiesFromMap.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropertiesFromMap.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropertiesFromMap.scala
index 002c5519f8bad..99d94f9fb5460 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropertiesFromMap.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropertiesFromMap.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class SetRelationshipPropertiesFromMap(source: LogicalPlan, idName: IdName, expression: Expression, removeOtherProps: Boolean)
                     (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropery.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropery.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropery.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropery.scala
index 58e34cb8ba5f2..21286229a7f7e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SetRelationshipPropery.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SetRelationshipPropery.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, PropertyKeyName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, PropertyKeyName}
 
 case class SetRelationshipPropery(source: LogicalPlan, idName: IdName, propertyKey: PropertyKeyName,
                           expression: Expression)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SingleRow.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SingleRow.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SingleRow.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SingleRow.scala
index a4c2ed087570b..f8c6ad5657055 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SingleRow.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SingleRow.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class SingleRow()(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalLeafPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Skip.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Skip.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Skip.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Skip.scala
index b9035e65b0f7d..2e82579af2818 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Skip.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Skip.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Skip(left: LogicalPlan, count: Expression)
                (val solved: PlannerQuery with CardinalityEstimation) extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sort.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sort.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sort.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sort.scala
index 4c562eea87479..0e865fe078745 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Sort.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Sort.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.SortDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.SortDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Sort(left: LogicalPlan, sortItems: Seq[SortDescription])
                (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Strictness.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Strictness.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Strictness.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Strictness.scala
index 18d00a286c113..346b3c57e6878 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Strictness.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Strictness.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 sealed trait StrictnessMode extends (Strictness => Boolean) {
   self: Product =>
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/TriadicSelection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/TriadicSelection.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/TriadicSelection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/TriadicSelection.scala
index aec95c8b5b53a..516cb05333d50 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/TriadicSelection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/TriadicSelection.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UndirectedRelationshipByIdSeek.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UndirectedRelationshipByIdSeek.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UndirectedRelationshipByIdSeek.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UndirectedRelationshipByIdSeek.scala
index e7805b73eb9a1..d7710f551fb0c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UndirectedRelationshipByIdSeek.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UndirectedRelationshipByIdSeek.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class UndirectedRelationshipByIdSeek(idName: IdName,
                                           relIds: SeekableArgs,
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Union.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Union.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Union.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Union.scala
index bc51db88e4a1e..3bc0bf7b0aa9f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/Union.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/Union.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
 
 case class Union(left: LogicalPlan, right: LogicalPlan)(val solved: PlannerQuery with CardinalityEstimation)
   extends LogicalPlan with LazyLogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UnwindCollection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UnwindCollection.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UnwindCollection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UnwindCollection.scala
index 137973854ae38..e3f9f35b04fd4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/UnwindCollection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/UnwindCollection.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 case class UnwindCollection(left: LogicalPlan, variable: IdName, expression: Expression)
                            (val solved: PlannerQuery with CardinalityEstimation)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ValueHashJoin.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ValueHashJoin.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ValueHashJoin.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ValueHashJoin.scala
index 0d821e68ffefa..862773cb64730 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ValueHashJoin.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ValueHashJoin.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Equals
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Equals
 
 /*
 Represents a common hash join on values and not node ids. The definition of a value join is an equality predicate
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/LogicalPlanRewriter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
index dda1e1325256e..e3d3e7f7426b1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
 
 /*
  * Rewriters that live here are required to adhere to the contract of
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEager.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEager.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEager.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEager.scala
index 6312ebf124753..9d3d57624518c 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEager.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEager.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object cleanUpEager extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/fuseSelections.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/fuseSelections.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/fuseSelections.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/fuseSelections.scala
index 9845bdd1b3e1a..242ee6baa5399 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/fuseSelections.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/fuseSelections.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.Selection
-import org.neo4j.cypher.internal.frontend.v3_0.{bottomUp, Rewriter}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.Selection
+import org.neo4j.cypher.internal.frontend.v3_1.{bottomUp, Rewriter}
 
 case object fuseSelections extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
index f1b023bd74fad..d3b4f6caa5d2e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlans.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlans.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlans.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlans.scala
index b3e14a7d24d73..76991dd6cd66f 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlans.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlans.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 /**
  * Runs through LogicalPlan and copies duplicate plans to make sure the
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/simplifyEquality.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/simplifyEquality.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/simplifyEquality.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/simplifyEquality.scala
index 1f9146feab95c..4a8f35e75000e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/simplifyEquality.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/simplifyEquality.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object simplifyEquality extends Rewriter {
   override def apply(input: AnyRef) = instance.apply(input)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestApply.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestApply.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestApply.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestApply.scala
index eba7434c84e94..846e9f9f351de 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestApply.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestApply.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, topDown}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, topDown}
 
 case object unnestApply extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestOptional.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestOptional.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestOptional.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestOptional.scala
index 1148be29a459c..1dd6c56d53d63 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/unnestOptional.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/unnestOptional.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 case object unnestOptional extends Rewriter {
 
   override def apply(input: AnyRef) = if (isSafe(input)) instance.apply(input) else input
 
-  import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
+  import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
 
   /*
    * It is not safe to unnest an optional expand with when we have
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/DynamicPropertyNotifier.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/DynamicPropertyNotifier.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/DynamicPropertyNotifier.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/DynamicPropertyNotifier.scala
index e8ad234d83921..d95df3c585489 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/DynamicPropertyNotifier.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/DynamicPropertyNotifier.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Variable, LabelName}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Variable, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 
 object DynamicPropertyNotifier {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/IndexSeekLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/IndexSeekLeafPlanner.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/IndexSeekLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/IndexSeekLeafPlanner.scala
index 5d64e408efa76..c2a631d8e0945 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/IndexSeekLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/IndexSeekLeafPlanner.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{SingleQueryExpression, QueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.IndexLookupUnfulfillableNotification
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{SingleQueryExpression, QueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.IndexLookupUnfulfillableNotification
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 abstract class AbstractIndexSeekLeafPlanner extends LeafPlanner {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LogicalPlanProducer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LogicalPlanProducer.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LogicalPlanProducer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LogicalPlanProducer.scala
index ae55946f7263d..868d372cc0732 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LogicalPlanProducer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LogicalPlanProducer.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.commands.QueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyType, LazyTypes, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.CardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{DeleteExpression => DeleteExpressionPlan, Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, SortDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{DeleteExpression, _}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, SemanticDirection, ast, _}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.commands.QueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyType, LazyTypes, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.CardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{DeleteExpression => DeleteExpressionPlan, Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, SortDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{DeleteExpression, _}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, SemanticDirection, ast, _}
 
 /*
  * The responsibility of this class is to produce the correct solved PlannerQuery when creating logical plans.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolver.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolver.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolver.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolver.scala
index dde2fd5eaeff3..f894b9ba56db2 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolver.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolver.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.projectNamedPaths
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{FreshIdNameGenerator, UnNamedNameGenerator}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, PatternExpressionPatternElementNamer, patternExpressionRewriter}
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions.Exists
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, ast, topDown}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.projectNamedPaths
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{FreshIdNameGenerator, UnNamedNameGenerator}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, PatternExpressionPatternElementNamer, patternExpressionRewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions.Exists
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, ast, topDown}
 
 import scala.collection.mutable
 import scala.reflect.ClassTag
@@ -107,7 +107,7 @@ object PatternExpressionSolver {
   def solvePatternExpressions(availableSymbols: Set[IdName], context: LogicalPlanningContext, pathStepBuilder: EveryPath => PathStep): CollectionSubQueryExpressionSolver[PatternExpression] = {
 
     def extractQG(source: LogicalPlan, namedExpr: PatternExpression): QueryGraph = {
-      import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
+      import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
 
       val dependencies = namedExpr.
         dependencies.
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/Selector.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/Selector.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/Selector.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/Selector.scala
index a13b967df032b..a544af928ea40 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/Selector.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/Selector.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/aggregation.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/aggregation.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/aggregation.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/aggregation.scala
index 94145420479e7..884bcc613fc54 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/aggregation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/aggregation.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.AggregatingQueryProjection
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.AggregatingQueryProjection
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 object aggregation {
   def apply(plan: LogicalPlan, aggregation: AggregatingQueryProjection)(implicit context: LogicalPlanningContext): LogicalPlan = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/allNodesLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/allNodesLeafPlanner.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/allNodesLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/allNodesLeafPlanner.scala
index eb2f3d552d14e..2f43105a95ac7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/allNodesLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/allNodesLeafPlanner.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LeafPlanner, LogicalPlanningContext}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LeafPlanner, LogicalPlanningContext}
 
 object allNodesLeafPlanner extends LeafPlanner {
   def apply(queryGraph: QueryGraph)(implicit context: LogicalPlanningContext) =
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/argumentLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/argumentLeafPlanner.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/argumentLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/argumentLeafPlanner.scala
index a2c7ff4990531..96e0afd7f91fd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/argumentLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/argumentLeafPlanner.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LeafPlanner, LogicalPlanningContext}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LeafPlanner, LogicalPlanningContext}
 
 object argumentLeafPlanner extends LeafPlanner {
   def apply(qg: QueryGraph)(implicit context: LogicalPlanningContext) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlanner.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlanner.scala
index cd4d3c65d43df..068e9bd9b1daa 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlanner.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyTypes
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyTypes
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 case object countStorePlanner {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/getDegreeRewriter.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/getDegreeRewriter.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/getDegreeRewriter.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/getDegreeRewriter.scala
index 43d7c00d9ba25..52b0a3c080a68 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/getDegreeRewriter.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/getDegreeRewriter.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.NestedPlanExpression
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.NestedPlanExpression
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 case object getDegreeRewriter extends Rewriter {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/idSeekLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/idSeekLeafPlanner.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/idSeekLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/idSeekLeafPlanner.scala
index ab136989c33d8..8e6424f701756 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/idSeekLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/idSeekLeafPlanner.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 object idSeekLeafPlanner extends LeafPlanner {
   def apply(queryGraph: QueryGraph)(implicit context: LogicalPlanningContext) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/indexScanLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/indexScanLeafPlanner.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/indexScanLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/indexScanLeafPlanner.scala
index 14f2ed741b7bf..7a895b60b1a4d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/indexScanLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/indexScanLeafPlanner.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LeafPlanner, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.IndexLookupUnfulfillableNotification
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LeafPlanner, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.IndexLookupUnfulfillableNotification
 
 object indexScanLeafPlanner extends LeafPlanner {
   override def apply(qg: QueryGraph)(implicit context: LogicalPlanningContext): Seq[LogicalPlan] = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/labelScanLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/labelScanLeafPlanner.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/labelScanLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/labelScanLeafPlanner.scala
index 0cd4177b40f1d..5f797f9e65118 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/labelScanLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/labelScanLeafPlanner.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LeafPlanner, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{UsingScanHint, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LeafPlanner, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{UsingScanHint, Variable}
 
 object labelScanLeafPlanner extends LeafPlanner {
   def apply(qg: QueryGraph)(implicit context: LogicalPlanningContext) = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/leafPlanOptions.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/leafPlanOptions.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/leafPlanOptions.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/leafPlanOptions.scala
index 3172add7bd867..18b5de3f6a0ce 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/leafPlanOptions.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/leafPlanOptions.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LeafPlanFinder, LogicalPlanningContext, QueryPlannerConfiguration}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LeafPlanFinder, LogicalPlanningContext, QueryPlannerConfiguration}
 
 object leafPlanOptions extends LeafPlanFinder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala
index f9bdb51c169b2..aad63a63696c7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/mergeUniqueIndexSeekLeafPlanner.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.QueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, NodeUniqueIndexSeek}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, HasLabels, LabelToken, PropertyKeyToken, UsingIndexHint}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.QueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, NodeUniqueIndexSeek}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, HasLabels, LabelToken, PropertyKeyToken, UsingIndexHint}
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 /*
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala
index fce18fe3806bb..2077c77c1c7a1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/pickBestPlanUsingHintsAndCost.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{CandidateSelector, LogicalPlanningContext, LogicalPlanningFunction0}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{CandidateSelector, LogicalPlanningContext, LogicalPlanningFunction0}
 
 object pickBestPlanUsingHintsAndCost extends LogicalPlanningFunction0[CandidateSelector] {
   val VERBOSE = java.lang.Boolean.getBoolean("pickBestPlan.VERBOSE")
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/planShortestPaths.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/planShortestPaths.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/planShortestPaths.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/planShortestPaths.scala
index 32b9237ca4002..ff55fcdeb4692 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/planShortestPaths.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/planShortestPaths.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.projectNamedPaths
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.FreshIdNameGenerator
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Ascending, LogicalPlanningContext}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.expandSolverStep
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, ShortestPathPattern, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{Predicate, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.ExhaustiveShortestPathForbiddenNotification
-import org.neo4j.cypher.internal.frontend.v3_0.{ExhaustiveShortestPathForbiddenException, InternalException}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions.Length
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.projectNamedPaths
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.FreshIdNameGenerator
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Ascending, LogicalPlanningContext}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.expandSolverStep
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, ShortestPathPattern, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{Predicate, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.ExhaustiveShortestPathForbiddenNotification
+import org.neo4j.cypher.internal.frontend.v3_1.{ExhaustiveShortestPathForbiddenException, InternalException}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions.Length
 
 case object planShortestPaths {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/projection.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/projection.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/projection.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/projection.scala
index 53e0d2febc7f4..ed327ce1af7f1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/projection.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/projection.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LogicalPlanningContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LogicalPlanningContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
 
 object projection {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectCovered.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectCovered.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectCovered.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectCovered.scala
index 8f06e76b33df7..7b162d082d8d7 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectCovered.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectCovered.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
 
 case object selectCovered extends CandidateGenerator[LogicalPlan] {
   val patternExpressionSolver = PatternExpressionSolver()
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectHasLabelWithJoin.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectHasLabelWithJoin.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectHasLabelWithJoin.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectHasLabelWithJoin.scala
index c8936b1855c5a..d2b72858afe9b 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectHasLabelWithJoin.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectHasLabelWithJoin.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{CandidateGenerator, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{HasLabels, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{CandidateGenerator, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{HasLabels, Variable}
 
 case object selectHasLabelWithJoin extends CandidateGenerator[LogicalPlan] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectPatternPredicates.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectPatternPredicates.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectPatternPredicates.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectPatternPredicates.scala
index d742cd2b2cef0..1c26d97a6e450 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/selectPatternPredicates.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/selectPatternPredicates.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.FreshIdNameGenerator
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.FreshIdNameGenerator
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 
 case object selectPatternPredicates extends CandidateGenerator[LogicalPlan] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/solveOptionalMatches.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/solveOptionalMatches.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/solveOptionalMatches.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/solveOptionalMatches.scala
index fcd7d52db1685..7448fbc7828d4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/solveOptionalMatches.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/solveOptionalMatches.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.solveOptionalMatches.OptionalSolver
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, LogicalPlanningFunction2}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.solveOptionalMatches.OptionalSolver
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, LogicalPlanningFunction2}
 
 object solveOptionalMatches {
   type OptionalSolver = LogicalPlanningFunction2[QueryGraph, LogicalPlan, Option[LogicalPlan]]
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/sortSkipAndLimit.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/sortSkipAndLimit.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/sortSkipAndLimit.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/sortSkipAndLimit.scala
index c45eb49348317..8f7f748ebf875 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/sortSkipAndLimit.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/sortSkipAndLimit.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{PlannerQuery, QueryProjection}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, ast}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{PlannerQuery, QueryProjection}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, ast}
 
 object sortSkipAndLimit extends PlanTransformer[PlannerQuery] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/triadicSelectionFinder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/triadicSelectionFinder.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/triadicSelectionFinder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/triadicSelectionFinder.scala
index 0a96fb9994c3e..68aaf8c82bdad 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/triadicSelectionFinder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/triadicSelectionFinder.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{CandidateGenerator, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{CandidateGenerator, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 
 object triadicSelectionFinder extends CandidateGenerator[LogicalPlan] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/verifyBestPlan.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/verifyBestPlan.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/verifyBestPlan.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/verifyBestPlan.scala
index 7ba07665e68b1..7f41a4cc3d354 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/verifyBestPlan.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/verifyBestPlan.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, PlanTransformer}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CantHandleQueryException, PlannerQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{IndexHintUnfulfillableNotification, JoinHintUnfulfillableNotification}
-import org.neo4j.cypher.internal.frontend.v3_0.{IndexHintException, JoinHintException}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, PlanTransformer}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CantHandleQueryException, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{IndexHintUnfulfillableNotification, JoinHintUnfulfillableNotification}
+import org.neo4j.cypher.internal.frontend.v3_1.{IndexHintException, JoinHintException}
 
 object verifyBestPlan extends PlanTransformer[PlannerQuery] {
   def apply(plan: LogicalPlan, expected: PlannerQuery)(implicit context: LogicalPlanningContext): LogicalPlan = {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/package.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/package.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/package.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/package.scala
index 23d7e0e23b642..3f8542053d0e1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/package.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/package.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 package object planner {
   type QueryAcceptor = UnionQuery => Boolean
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/Prettifier.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/Prettifier.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/Prettifier.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/Prettifier.scala
index a4aad99c568ea..b048efe283865 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/Prettifier.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/Prettifier.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.prettifier
+package org.neo4j.cypher.internal.compiler.v3_1.prettifier
 
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Base, Strings}
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Base, Strings}
 import org.parboiled.scala._
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/Profiler.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/Profiler.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/Profiler.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/Profiler.scala
index 2223023bdc485..ff8530d877cb1 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/Profiler.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/Profiler.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.profiler
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{Pipe, PipeDecorator, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{DelegatingOperations, DelegatingQueryContext, Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ProfilerStatisticsNotReadyException
+package org.neo4j.cypher.internal.compiler.v3_1.profiler
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{Pipe, PipeDecorator, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{DelegatingOperations, DelegatingQueryContext, Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ProfilerStatisticsNotReadyException
 import org.neo4j.graphdb.{Node, PropertyContainer, Relationship}
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/repeatWithSizeLimit.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/repeatWithSizeLimit.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/repeatWithSizeLimit.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/repeatWithSizeLimit.scala
index c1e0f915f9070..ea58ad709d752 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/repeatWithSizeLimit.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/repeatWithSizeLimit.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ASTNode
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ASTNode
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/rewriteProcedureCalls.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/rewriteProcedureCalls.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/rewriteProcedureCalls.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/rewriteProcedureCalls.scala
index 2f3e3fc44c44e..c18d5bf7bc9cb 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/rewriteProcedureCalls.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/rewriteProcedureCalls.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 // Given a way to lookup procedure signatures, this factory returns a rewriter that
 // turns unresolved calls into resolved calls
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResources.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResources.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResources.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResources.scala
index f532ce87950ee..d2e332de35bd4 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResources.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResources.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.io._
 import java.net.{CookieHandler, CookieManager, CookiePolicy, URL}
@@ -26,9 +26,9 @@ import java.nio.file.Paths
 import java.util.zip.{GZIPInputStream, InflaterInputStream}
 
 import org.neo4j.csv.reader._
-import org.neo4j.cypher.internal.compiler.v3_0.TaskCloser
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.ExternalCSVResource
-import org.neo4j.cypher.internal.frontend.v3_0.LoadExternalResourceException
+import org.neo4j.cypher.internal.compiler.v3_1.TaskCloser
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.ExternalCSVResource
+import org.neo4j.cypher.internal.frontend.v3_1.LoadExternalResourceException
 
 import scala.collection.mutable.ArrayBuffer
 import scala.util.control.Breaks._
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/DelegatingQueryContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/DelegatingQueryContext.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/DelegatingQueryContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/DelegatingQueryContext.scala
index d9bb52e38efe0..7227567c616cd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/DelegatingQueryContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/DelegatingQueryContext.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expander, KernelPredicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expander, KernelPredicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternNode
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Node, Path, PropertyContainer, Relationship}
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatistics.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatistics.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatistics.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatistics.scala
index d6b9a6f37a73a..d3f52e95d3120 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatistics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatistics.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, RelTypeId}
 
 object GraphStatistics {
   val DEFAULT_RANGE_SELECTIVITY          = Selectivity.of(0.3).get
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/IdempotentResult.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/IdempotentResult.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/IdempotentResult.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/IdempotentResult.scala
index 35cd1c4bc5946..2eb211ccb5c52 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/IdempotentResult.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/IdempotentResult.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 final case class IdempotentResult[T](value: T, wasCreated: Boolean = true) {
   def ifCreated[R](f: => R): Option[R] = if (wasCreated) Some(f) else None
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/InstrumentedGraphStatistics.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/InstrumentedGraphStatistics.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/InstrumentedGraphStatistics.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/InstrumentedGraphStatistics.scala
index 089a2678095ec..070fad386f005 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/InstrumentedGraphStatistics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/InstrumentedGraphStatistics.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.frontend.v3_0.{PropertyKeyId, RelTypeId, LabelId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.frontend.v3_1.{PropertyKeyId, RelTypeId, LabelId}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/PlanContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/PlanContext.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/PlanContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/PlanContext.scala
index 54e631ed4cc37..a3063b844fdd9 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/PlanContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/PlanContext.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.EntityProducer
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.EntityProducer
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, TraversalMatcher}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.constraints.UniquenessConstraint
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureCallMode.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureCallMode.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureCallMode.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureCallMode.scala
index e479ae92b29c7..427b027536b66 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureCallMode.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureCallMode.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{DBMS, InternalQueryType, READ_ONLY, READ_WRITE}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{DBMS, InternalQueryType, READ_ONLY, READ_WRITE}
 
 import scala.collection.mutable.ArrayBuffer
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureSignature.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureSignature.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureSignature.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureSignature.scala
index 33e195043c105..7540eb5cbb53e 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/ProcedureSignature.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/ProcedureSignature.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.UnresolvedCall
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.ast.UnresolvedCall
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 
 case class ProcedureSignature(name: QualifiedProcedureName,
                               inputSignature: Seq[FieldSignature],
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContext.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContext.scala
index 923fdb4e18b77..19ede5bd42cd6 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContext.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.InternalQueryStatistics
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expander, KernelPredicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.InternalQueryStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expander, KernelPredicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternNode
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Node, Path, PropertyContainer, Relationship}
 import org.neo4j.kernel.api.constraints.{NodePropertyExistenceConstraint, RelationshipPropertyExistenceConstraint, UniquenessConstraint}
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/TokenContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/TokenContext.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/TokenContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/TokenContext.scala
index effd3ca84bc34..741753159eacc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/TokenContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/TokenContext.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 trait TokenContext {
   def getLabelName(id: Int): String
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContext.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContext.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContext.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContext.scala
index f5de212d106d8..2dd9c8c3dea54 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContext.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContext.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.util.concurrent.atomic.AtomicInteger
-import org.neo4j.cypher.internal.compiler.v3_0.InternalQueryStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.InternalQueryStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{PropertyContainer, Relationship, Node}
 
 class UpdateCountingQueryContext(inner: QueryContext) extends DelegatingQueryContext(inner) {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTable.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTable.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTable.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTable.scala
index 3295789d2b562..ac9a2dfe8098d 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTable.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.symbols
+package org.neo4j.cypher.internal.compiler.v3_1.symbols
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherException, CypherTypeException, SyntaxException}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherException, CypherTypeException, SyntaxException}
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTypeAssertionCompiler.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTypeAssertionCompiler.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTypeAssertionCompiler.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTypeAssertionCompiler.scala
index 120fd2b4dff28..559cfd4005189 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTypeAssertionCompiler.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTypeAssertionCompiler.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.symbols
+package org.neo4j.cypher.internal.compiler.v3_1.symbols
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.annotation.tailrec
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterCondition.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterCondition.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterCondition.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterCondition.scala
index 18060b7886d8c..4e3c2d081b433 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterCondition.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterCondition.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 
 final case class RewriterCondition(name: String, condition: Any => Seq[String])
   extends (Any => Option[RewriterConditionFailure]) with CollectionSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStep.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStep.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStep.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStep.scala
index 26c1d2b6b5ae1..50a9edc7cb9cd 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStep.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStep.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
 
 object RewriterStep {
    implicit def namedProductRewriter(p: Product with Rewriter): ApplyRewriter = ApplyRewriter(p.productPrefix, p)
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencer.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencer.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencer.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencer.scala
index f280bb9d497f6..1b4a3284c34fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencer.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTask.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTask.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTask.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTask.scala
index 58873cac552aa..0e8cfef635648 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTask.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTask.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
 
 sealed trait RewriterTask
 final case class RunConditions(previousName: Option[String], conditions: Set[RewriterCondition]) extends RewriterTask
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskBuilder.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskBuilder.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskBuilder.scala
index 3b514917d3e06..5a5e279228037 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskBuilder.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
 
 case object RewriterTaskBuilder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskProcessor.scala b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskProcessor.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskProcessor.scala
rename to community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskProcessor.scala
index b83c5119c4442..8fbf1661e0a7a 100644
--- a/community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterTaskProcessor.scala
+++ b/community/cypher/cypher-compiler-3.1/src/main/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterTaskProcessor.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, Rewriter}
 
 trait RewriterTaskProcessor extends (RewriterTask => Rewriter) {
   def sequenceName: String
diff --git a/community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/SetStaticFieldTest.java b/community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/SetStaticFieldTest.java
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/SetStaticFieldTest.java
rename to community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/SetStaticFieldTest.java
index 59d77b67cfbf0..4a49e66011132 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/codegen/SetStaticFieldTest.java
+++ b/community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/codegen/SetStaticFieldTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen;
+package org.neo4j.cypher.internal.compiler.v3_1.codegen;
 
 import org.junit.Test;
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipeTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipeTest.scala
index d77770aa3678d..c80419b4544b2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/java/org/neo4j/cypher/internal/compiler/v3_0/pipes/ErrorPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/java/org/neo4j/cypher/internal/compiler/v3_1/pipes/ErrorPipeTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ErrorPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ClosingIteratorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ClosingIteratorTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ClosingIteratorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ClosingIteratorTest.scala
index 4c63c35c6b390..68861fab4df72 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ClosingIteratorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ClosingIteratorTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.mockito.Matchers.anyBoolean
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ClosingIteratorTest extends CypherFunSuite {
   var taskCloser: TaskCloser = _
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentityMapTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentityMapTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentityMapTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentityMapTest.scala
index c2b3fdb3e4291..0d474d41b6e90 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/IdentityMapTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/IdentityMapTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.IdentityMap
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.IdentityMap
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IdentityMapTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/InputPositionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/InputPositionTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/InputPositionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/InputPositionTest.scala
index 78b1235649891..4112b4f1c099e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/InputPositionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/InputPositionTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 class InputPositionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCacheTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCacheTest.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCacheTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCacheTest.scala
index bfd22d953a23c..865157fd94e28 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LRUCacheTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LRUCacheTest.scala
@@ -17,22 +17,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LRUCacheTest extends CypherFunSuite {
 
   test("shouldStoreSingleValue") {
-    val cache = new v3_0.LRUCache[String, String](5)
+    val cache = new v3_1.LRUCache[String, String](5)
     cache.getOrElseUpdate("hello", "world")
 
     cache.get("hello") should equal(Some("world"))
   }
 
   test("shouldLooseTheFirstOne") {
-    val cache = new v3_0.LRUCache[String, String](5)
+    val cache = new v3_1.LRUCache[String, String](5)
     fillWithOneToFive(cache)
 
     cache.getOrElseUpdate("6", "6")
@@ -41,7 +41,7 @@ class LRUCacheTest extends CypherFunSuite {
   }
 
   test("shouldLooseTheLeastUsedItem") {
-    val cache = new v3_0.LRUCache[String, String](5)
+    val cache = new v3_1.LRUCache[String, String](5)
     fillWithOneToFive(cache)
 
     cache.get("1")
@@ -54,7 +54,7 @@ class LRUCacheTest extends CypherFunSuite {
     cache.containsKey("2") should equal(false);
   }
 
-  def fillWithOneToFive(cache: v3_0.LRUCache[String, String]) {
+  def fillWithOneToFive(cache: v3_1.LRUCache[String, String]) {
     cache.put("1", "1")
     cache.put("2", "2")
     cache.put("3", "3")
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/NullOrderingTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/NullOrderingTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/NullOrderingTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/NullOrderingTest.scala
index 3734b49694325..c1e2a23cfe20c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/NullOrderingTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/NullOrderingTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.impl.api.PropertyValueComparison
 
 class NullOrderingTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.MinMaxOrdering._
+  import org.neo4j.cypher.internal.compiler.v3_1.MinMaxOrdering._
 
   val orderingForNumbers = Ordering.comparatorToOrdering(PropertyValueComparison.COMPARE_NUMBERS)
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RewriteProcedureCallsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RewriteProcedureCallsTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RewriteProcedureCallsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RewriteProcedureCallsTest.scala
index 745e99a1e91c9..9928e061286b2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RewriteProcedureCallsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RewriteProcedureCallsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{FieldSignature, ProcedureReadOnlyAccess, ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{FieldSignature, ProcedureReadOnlyAccess, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RewriteProcedureCallsTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTest.scala
index 5742dcc90bfc3..213fbb5b2d66d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ScopeTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.helpers.ScopeTestHelper._
+  import org.neo4j.cypher.internal.compiler.v3_1.helpers.ScopeTestHelper._
 
   test("Should retrieve local symbol definitions") {
     val given = scope(
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeTest.scala
index bfd86e4f9a3b2..ca9ec4f73b274 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
 
 class ScopeTreeTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.helpers.ScopeTestHelper._
-  import org.neo4j.cypher.internal.compiler.v3_0.helpers.StatementHelper._
-  import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture.parser
+  import org.neo4j.cypher.internal.compiler.v3_1.helpers.ScopeTestHelper._
+  import org.neo4j.cypher.internal.compiler.v3_1.helpers.StatementHelper._
+  import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture.parser
 
   /*
    * NOTE: when computing the scopeTree the normalization of return and with clauses has already taken place, so when
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerificationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerificationTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerificationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerificationTest.scala
index d8f87a4cc00f4..860ec8a5c5e67 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScopeTreeVerificationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScopeTreeVerificationTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.Scope
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.Scope
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ScopeTreeVerificationTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.helpers.ScopeTestHelper._
+  import org.neo4j.cypher.internal.compiler.v3_1.helpers.ScopeTestHelper._
 
   test("should reject scopes mapping the wrong name to a symbol") {
     val given = Scope(Map("a" -> intSymbol("a", 3), "b" -> intSymbol("x", 5)), Seq())
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRangeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRangeTest.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRangeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRangeTest.scala
index 5fb3150db311c..1d5539ca00887 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SeekRangeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SeekRangeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound}
 
 class SeekRangeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticCheckableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticCheckableTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticCheckableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticCheckableTest.scala
index 33199a4ef9321..de3498bc21230 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticCheckableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticCheckableTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SemanticCheckableTest extends CypherFunSuite with SemanticChecking {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticStateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticStateTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticStateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticStateTest.scala
index 5bd6786b7f2ae..2469d2f6c18a9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticStateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticStateTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class SemanticStateTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloserTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloserTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloserTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloserTest.scala
index 223edeaadccbe..3bbdd93d4c2a8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TaskCloserTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TaskCloserTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.BeforeAndAfter
 
 class TaskCloserTest extends CypherFunSuite with BeforeAndAfter {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TypeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TypeTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TypeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TypeTest.scala
index 501b17d862f2c..da06088fe649a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TypeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TypeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TypeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/CallClauseTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/CallClauseTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/CallClauseTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/CallClauseTest.scala
index 7226c3eff053d..570901944fe44 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/CallClauseTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/CallClauseTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{FieldSignature, ProcedureReadOnlyAccess, ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheckResult, SemanticState}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{FieldSignature, ProcedureReadOnlyAccess, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheckResult, SemanticState}
 
 class CallClauseTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/FilteringExpressionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/FilteringExpressionTest.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/FilteringExpressionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/FilteringExpressionTest.scala
index 3fd1da382da36..3804f1350500d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/FilteringExpressionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/FilteringExpressionTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{DummyExpression, Expression, FilteringExpression, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
+package org.neo4j.cypher.internal.compiler.v3_1.ast
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{DummyExpression, Expression, FilteringExpression, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
 
 class FilteringExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTaggerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTaggerTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTaggerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTaggerTest.scala
index e5e40c47b13c3..9d28133e546d2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTaggerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTaggerTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryTaggerTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagsTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagsTest.scala
index b56da2bc21947..279fdad61dfd2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/QueryTagsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/QueryTagsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast
+package org.neo4j.cypher.internal.compiler.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryTagsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/AggregationsAreIsolatedTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/AggregationsAreIsolatedTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/AggregationsAreIsolatedTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/AggregationsAreIsolatedTest.scala
index 391d67751e202..94b5b1a0b292d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/AggregationsAreIsolatedTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/AggregationsAreIsolatedTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AggregationsAreIsolatedTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/CollectNodesOfTypeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/CollectNodesOfTypeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/CollectNodesOfTypeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/CollectNodesOfTypeTest.scala
index ef7329110804a..8963bed6d8017 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/CollectNodesOfTypeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/CollectNodesOfTypeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CollectNodesOfTypeTest extends CypherFunSuite with AstConstructionTestSupport{
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala
index 1657d4b4e11df..972a7598cfe20 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNamedPathOnlyForShortestPathTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ContainsNamedPathOnlyForShortestPathTest extends CypherFunSuite with AstConstructionTestSupport {
   private val condition: (Any => Seq[String]) = containsNamedPathOnlyForShortestPath
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoMatchingNodesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoMatchingNodesTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoMatchingNodesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoMatchingNodesTest.scala
index 12d318a4c4666..0dec544cfcd38 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoMatchingNodesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoMatchingNodesTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ContainsNoMatchingNodesTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoNodesOfTypeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoNodesOfTypeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoNodesOfTypeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoNodesOfTypeTest.scala
index 755ffeaf890f7..11f22e98dd740 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/ContainsNoNodesOfTypeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/ContainsNoNodesOfTypeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ContainsNoNodesOfTypeTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoDuplicatesInReturnItemsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoDuplicatesInReturnItemsTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoDuplicatesInReturnItemsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoDuplicatesInReturnItemsTest.scala
index 2cdd4459d30f0..1f3e3e4bc77b3 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoDuplicatesInReturnItemsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoDuplicatesInReturnItemsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NoDuplicatesInReturnItemsTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala
index cab6a464e5e3e..82b32c5c46934 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoReferenceEqualityAmongVariablesTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NoReferenceEqualityAmongVariablesTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala
index b4969fed53bb9..a778c5c3fda8b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NoUnnamedPatternElementsInMatchTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NoUnnamedPatternElementsInMatchTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NormalizedEqualsArgumentsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NormalizedEqualsArgumentsTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NormalizedEqualsArgumentsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NormalizedEqualsArgumentsTest.scala
index 5b6e02a86f03b..1a6372e3f4028 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/NormalizedEqualsArgumentsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/NormalizedEqualsArgumentsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NormalizedEqualsArgumentsTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/OrderByOnlyOnVariablesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/OrderByOnlyOnVariablesTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/OrderByOnlyOnVariablesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/OrderByOnlyOnVariablesTest.scala
index 0bf10ce13318b..5ed43a28343c1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/conditions/OrderByOnlyOnVariablesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/conditions/OrderByOnlyOnVariablesTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.conditions
+package org.neo4j.cypher.internal.compiler.v3_1.ast.conditions
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class OrderByOnlyOnVariablesTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala
index a1b68b6f08363..4bd34c6bc1898 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/GroupInequalityPredicatesTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class GroupInequalityPredicatesTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala
index 6a28368f5d58a..b0d5b3aeb1b38 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/MutatingStatementConvertersTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{SimplePatternLength, PatternRelationship, IdName}
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{SimplePatternLength, PatternRelationship, IdName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MutatingStatementConvertersTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternExpressionConverterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternExpressionConverterTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternExpressionConverterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternExpressionConverterTest.scala
index e7f25b58f2126..22c9bce3c7917 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/PatternExpressionConverterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/PatternExpressionConverterTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, Predicate, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, Predicate, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
 
 class PatternExpressionConverterTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConvertersTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConvertersTest.scala
similarity index 99%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConvertersTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConvertersTest.scala
index b114f032aef6b..2bdfd041c4342 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/StatementConvertersTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/StatementConvertersTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, _}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{FieldSignature, ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, _}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{FieldSignature, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StatementConvertersTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/UnionStatementConvertersTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/UnionStatementConvertersTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/UnionStatementConvertersTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/UnionStatementConvertersTest.scala
index 18d43da9320a9..db13629dbb54e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/convert/plannerQuery/UnionStatementConvertersTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/convert/plannerQuery/UnionStatementConvertersTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery
+package org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{RegularQueryProjection, LogicalPlanningTestSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SignedDecimalIntegerLiteral
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{RegularQueryProjection, LogicalPlanningTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SignedDecimalIntegerLiteral
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnionStatementConvertersTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/AddUniquenessPredicatesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/AddUniquenessPredicatesTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/AddUniquenessPredicatesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/AddUniquenessPredicatesTest.scala
index 94519e66401ae..695ea153074c5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/AddUniquenessPredicatesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/AddUniquenessPredicatesTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AddUniquenessPredicatesTest extends CypherFunSuite with RewriteTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizerTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizerTest.scala
index 9aa66f77ffa4d..49f02291fb436 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CNFNormalizerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CNFNormalizerTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.AstRewritingMonitor
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.AstRewritingMonitor
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CNFNormalizerTest extends CypherFunSuite with PredicateTestSupport {
   def rewriter: Rewriter = CNFNormalizer()(mock[AstRewritingMonitor])
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CollapseInCollectionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CollapseInCollectionsTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CollapseInCollectionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CollapseInCollectionsTest.scala
index b57746c77a680..6dbbd3c10e6e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/CollapseInCollectionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/CollapseInCollectionsTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.AstRewritingMonitor
-import org.neo4j.cypher.internal.compiler.v3_0.planner.AstRewritingTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.AstRewritingMonitor
+import org.neo4j.cypher.internal.compiler.v3_1.planner.AstRewritingTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CollapseInCollectionsTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DeMorganRewriterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DeMorganRewriterTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DeMorganRewriterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DeMorganRewriterTest.scala
index bba67a61e34be..3497c01daf6bb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DeMorganRewriterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DeMorganRewriterTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class DeMorganRewriterTest extends CypherFunSuite with PredicateTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DistributeLawRewriterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DistributeLawRewriterTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DistributeLawRewriterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DistributeLawRewriterTest.scala
index d05debb1eaf14..1f48d6807401d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/DistributeLawRewriterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/DistributeLawRewriterTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.AstRewritingMonitor
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Or
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.AstRewritingMonitor
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Or
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class DistributeLawRewriterTest extends CypherFunSuite with PredicateTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ExpandStarTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ExpandStarTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ExpandStarTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ExpandStarTest.scala
index c82555596f5a8..40c895cb6fb96 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ExpandStarTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ExpandStarTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticState, inSequence}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticState, inSequence}
 
 class ExpandStarTest extends CypherFunSuite with AstConstructionTestSupport {
   import parser.ParserFixture.parser
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FlattenBooleanOperatorsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FlattenBooleanOperatorsTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FlattenBooleanOperatorsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FlattenBooleanOperatorsTest.scala
index 33f190d01e4b0..936034b459332 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FlattenBooleanOperatorsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FlattenBooleanOperatorsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FlattenBooleanOperatorsTest extends CypherFunSuite with PredicateTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FoldConstantsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FoldConstantsTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FoldConstantsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FoldConstantsTest.scala
index ab150873befa8..407c6f0ab7e0b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/FoldConstantsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/FoldConstantsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FoldConstantsTest extends CypherFunSuite with RewriteTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InlineProjectionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InlineProjectionsTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InlineProjectionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InlineProjectionsTest.scala
index b3647b2356aab..65a1eca3fb49d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InlineProjectionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InlineProjectionsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
 import org.apache.commons.lang3.SystemUtils
-import org.neo4j.cypher.internal.compiler.v3_0.SyntaxExceptionCreator
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{AstRewritingTestSupport, CantHandleQueryException}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticState, inSequence}
+import org.neo4j.cypher.internal.compiler.v3_1.SyntaxExceptionCreator
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{AstRewritingTestSupport, CantHandleQueryException}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticState, inSequence}
 
 class InlineProjectionsTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextCreatorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextCreatorTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextCreatorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextCreatorTest.scala
index 730efc7a2097d..61f929eb0ed07 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextCreatorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextCreatorTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.AstRewritingTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.AstRewritingTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class InliningContextCreatorTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextTest.scala
index ec1cbdb60e3ff..2b086f8ab9775 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/InliningContextTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/InliningContextTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class InliningContextTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/IsolateAggregationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/IsolateAggregationTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/IsolateAggregationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/IsolateAggregationTest.scala
index 4f5acd44dc408..37864fa131bca 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/IsolateAggregationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/IsolateAggregationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.SyntaxExceptionCreator
-import org.neo4j.cypher.internal.frontend.v3_0.inSequence
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.SyntaxExceptionCreator
+import org.neo4j.cypher.internal.frontend.v3_1.inSequence
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IsolateAggregationTest extends CypherFunSuite with RewriteTest with AstConstructionTestSupport {
   val rewriterUnderTest = isolateAggregation
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/LiteralReplacementTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/LiteralReplacementTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/LiteralReplacementTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/LiteralReplacementTest.scala
index ef0498911917e..8cbb7a78dbab5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/LiteralReplacementTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/LiteralReplacementTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Parameter
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Parameter
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 class LiteralReplacementTest extends CypherFunSuite  {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture.parser
+  import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture.parser
 
   test("should extract starts with patterns") {
     assertRewrite("RETURN x STARTS WITH 'Pattern' as X", "RETURN x STARTS WITH {`  AUTOSTRING0`} as X", Map("  AUTOSTRING0" -> "Pattern"))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizerTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizerTest.scala
index 16daad058e598..6897bd45bf8ee 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/MatchPredicateNormalizerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/MatchPredicateNormalizerTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, inSequence}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, inSequence}
 
 class MatchPredicateNormalizerTest extends CypherFunSuite with RewriteTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NameMatchPatternElementTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NameMatchPatternElementTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NameMatchPatternElementTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NameMatchPatternElementTest.scala
index ea3853488eee2..1a57b92133218 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NameMatchPatternElementTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NameMatchPatternElementTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NameMatchPatternElementTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NamespacerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NamespacerTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NamespacerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NamespacerTest.scala
index ef69b19ac0407..0eb32b8a08dc9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NamespacerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NamespacerTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.StatementHelper._
-import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture.parser
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ASTAnnotationMap, AstConstructionTestSupport, Variable, Statement}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.StatementHelper._
+import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture.parser
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ASTAnnotationMap, AstConstructionTestSupport, Variable, Statement}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NamespacerTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeArgumentOrderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeArgumentOrderTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeArgumentOrderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeArgumentOrderTest.scala
index 248ab98d1577c..77794ec798e47 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeArgumentOrderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeArgumentOrderTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, Variable, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, Variable, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NormalizeArgumentOrderTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeComparisonsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeComparisonsTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeComparisonsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeComparisonsTest.scala
index 54f6ba1ee2eab..7d760910f701f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeComparisonsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeComparisonsTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, Expression, Variable, InvalidNotEquals, NotEquals, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, Expression, Variable, InvalidNotEquals, NotEquals, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NormalizeComparisonsTest extends CypherFunSuite {
   val pos = DummyPosition(0)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeNotEqualsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeNotEqualsTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeNotEqualsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeNotEqualsTest.scala
index f59c9aebb0053..8bf7c1f792188 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeNotEqualsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeNotEqualsTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NormalizeNotEqualsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeReturnClausesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeReturnClausesTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeReturnClausesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeReturnClausesTest.scala
index d2e7eb0ce7fd9..74774be4e9067 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeReturnClausesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeReturnClausesTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, SyntaxException}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, SyntaxException}
 
 class NormalizeReturnClausesTest extends CypherFunSuite with RewriteTest with AstConstructionTestSupport {
   val mkException = new SyntaxExceptionCreator("<Query>", Some(pos))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeSargablePredicatesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeSargablePredicatesTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeSargablePredicatesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeSargablePredicatesTest.scala
index dad5ac33e5bc7..0f44a3f2aa54e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeSargablePredicatesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeSargablePredicatesTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions.Exists
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions.Exists
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NormalizeSargablePredicatesTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeWithClausesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeWithClausesTest.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeWithClausesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeWithClausesTest.scala
index 3cd5920e6e833..1feca9ff7b5ff 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/NormalizeWithClausesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/NormalizeWithClausesTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, SemanticState, SyntaxException}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, SemanticState, SyntaxException}
 
 class NormalizeWithClausesTest extends CypherFunSuite with RewriteTest with AstConstructionTestSupport {
   val mkException = new SyntaxExceptionCreator("<Query>", Some(pos))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitterTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitterTest.scala
index c1a285bf42985..e366a40a9d77d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateSplitterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateSplitterTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 object PredicateSplitterTest extends AstConstructionTestSupport {
   val RETURN_ALL = Return(distinct = false, ReturnItems(includeExisting = true, Seq.empty)_, None, None, None)_
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateTestSupport.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateTestSupport.scala
index 6aa6aec7ad253..43032f3143229 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/PredicateTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/PredicateTestSupport.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, Rewriter}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, Rewriter}
 
 trait PredicateTestSupport extends CypherTestSupport {
   self: CypherFunSuite =>
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectFreshSortExpressionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectFreshSortExpressionsTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectFreshSortExpressionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectFreshSortExpressionsTest.scala
index 6baf62d952445..444b0429f06f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectFreshSortExpressionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectFreshSortExpressionsTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, SemanticState, inSequence}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, SemanticState, inSequence}
 
 class ProjectFreshSortExpressionsTest extends CypherFunSuite with RewriteTest with AstConstructionTestSupport {
   val rewriterUnderTest: Rewriter = projectFreshSortExpressions
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectNamedPathsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectNamedPathsTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectNamedPathsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectNamedPathsTest.scala
index 1320bf7731cec..083c308047b30 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ProjectNamedPathsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ProjectNamedPathsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0.SyntaxExceptionCreator
-import org.neo4j.cypher.internal.compiler.v3_0.planner.AstRewritingTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SemanticState, inSequence}
+import org.neo4j.cypher.internal.compiler.v3_1.SyntaxExceptionCreator
+import org.neo4j.cypher.internal.compiler.v3_1.planner.AstRewritingTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SemanticState, inSequence}
 
 class ProjectNamedPathsTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReattachAliasedExpressionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReattachAliasedExpressionsTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReattachAliasedExpressionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReattachAliasedExpressionsTest.scala
index c39939c101f20..43cae5dc17199 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReattachAliasedExpressionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReattachAliasedExpressionsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ReattachAliasedExpressionsTest extends CypherFunSuite with RewriteTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala
index 7c8eb84275bf3..dcad2ee55f6f9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/ReplaceLiteralDynamicPropertyLookupsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ReplaceLiteralDynamicPropertyLookupsTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteEqualityToInCollectionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteEqualityToInCollectionTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteEqualityToInCollectionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteEqualityToInCollectionTest.scala
index 738db250f9e05..aff71acca587e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteEqualityToInCollectionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteEqualityToInCollectionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Query
-import org.neo4j.cypher.internal.compiler.v3_0.planner.AstRewritingTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Query
+import org.neo4j.cypher.internal.compiler.v3_1.planner.AstRewritingTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RewriteEqualityToInCollectionTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteTest.scala
index 988844b7f05c1..ed55af1ded991 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/RewriteTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/RewriteTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, Rewriter}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, Rewriter}
 
 trait RewriteTest {
   self: CypherFunSuite =>
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/SimplifyPredicatesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/SimplifyPredicatesTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/SimplifyPredicatesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/SimplifyPredicatesTest.scala
index bee1b96c6f4f9..f11c5ed62c0a5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ast/rewriters/SimplifyPredicatesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ast/rewriters/SimplifyPredicatesTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SimplifyPredicatesTest extends CypherFunSuite with PredicateTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImplTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImplTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImplTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImplTest.scala
index 87a15f2a846ab..d0fae08fe542a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ResultRowImplTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ResultRowImplTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ResultRowImplTest extends CypherFunSuite {
   test("int can be handled as a Number") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpressionTypesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpressionTypesTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpressionTypesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpressionTypesTest.scala
index b580de9d853ae..3f43ed8d67b34 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/expressions/CodeGenExpressionTypesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/expressions/CodeGenExpressionTypesTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Variable, CodeGenContext}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Variable, CodeGenContext}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CodeGenExpressionTypesTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracerTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracerTest.scala
index cc3de73c12c13..44c97bf0f42a1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/profiling/ProfilingTracerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/profiling/ProfilingTracerTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.profiling
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ProfilingTracerTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AddTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AddTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AddTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AddTest.scala
index e342bd4d1f42c..bd2d847228aab 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AddTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AddTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Add, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Add, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AddTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AllVariablesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AllVariablesTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AllVariablesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AllVariablesTest.scala
index 22f627ca5edb1..0e63903f579fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AllVariablesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AllVariablesTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AllVariablesTest extends CypherFunSuite {
   val x = AllVariables()
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AndsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AndsTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AndsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AndsTest.scala
index e41f5485172dd..ab513c60a7433 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/AndsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/AndsTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Ands, Not, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Ands, Not, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AndsTest extends CypherFunSuite {
   private implicit val state = QueryStateHelper.empty
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoalesceTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoalesceTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoalesceTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoalesceTest.scala
index 3dd8af8e2681a..1ffbd5a5fcba6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoalesceTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoalesceTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CoalesceFunction, Expression, Literal, Null}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{QueryState, QueryStateHelper}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CoalesceFunction, Expression, Literal, Null}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{QueryState, QueryStateHelper}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CoalesceTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoercedPredicateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoercedPredicateTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoercedPredicateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoercedPredicateTest.scala
index 77592ea29c4f6..ed29fd7881216 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CoercedPredicateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CoercedPredicateTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{CoercedPredicate, True, Not}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{QueryState, QueryStateHelper}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{CoercedPredicate, True, Not}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{QueryState, QueryStateHelper}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CoercedPredicateTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CollectionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CollectionTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CollectionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CollectionTest.scala
index 48f0a53d2c29f..ae21bcaabc045 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CollectionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CollectionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{CoercedPredicate, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{CoercedPredicate, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 
 class CollectionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ComparablePredicateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ComparablePredicateTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ComparablePredicateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ComparablePredicateTest.scala
index 994c492492694..df5d0de4841d1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ComparablePredicateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ComparablePredicateTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.{CypherOrdering, ExecutionContext}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.{CypherOrdering, ExecutionContext}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ComparablePredicateTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAstTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAstTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAstTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAstTest.scala
index 47035e34c4214..a8bb24cb0381f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/CreateUniqueAstTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/CreateUniqueAstTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CreateUniqueAstTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ExtractTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ExtractTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ExtractTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ExtractTest.scala
index cf5449716aad3..68422430e2a33 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ExtractTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ExtractTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{SizeFunction, ExtractFunction, Variable, LengthFunction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{SizeFunction, ExtractFunction, Variable, LengthFunction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ExtractTest extends CypherFunSuite {
   test("canReturnSomethingFromAnIterable") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/HasLabelTests.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/HasLabelTests.scala
similarity index 74%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/HasLabelTests.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/HasLabelTests.scala
index 8c5a1f15b76cc..207b2379c4062 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/HasLabelTests.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/HasLabelTests.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.HasLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.HasLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class HasLabelTests extends CypherFunSuite {
   test("should_handle_null_values") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LengthFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LengthFunctionTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LengthFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LengthFunctionTest.scala
index 43dbaa53792f8..240030658ea0d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/LengthFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/LengthFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{LengthFunction, Variable, PathImpl, SizeFunction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{LengthFunction, Variable, PathImpl, SizeFunction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class LengthFunctionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MatchPatternTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MatchPatternTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MatchPatternTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MatchPatternTest.scala
index 4c0a13649b590..fc708689eeb6a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MatchPatternTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MatchPatternTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{MatchPattern, MatchRelationship}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{MatchPattern, MatchRelationship}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MatchPatternTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MathFunctionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MathFunctionsTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MathFunctionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MathFunctionsTest.scala
index 3cef5a8b46cd5..721bb19c3c8f1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MathFunctionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MathFunctionsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MathFunctionsTest extends CypherFunSuite with NumericHelper {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAstTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAstTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAstTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAstTest.scala
index 6baed4455f14f..790f6f1010e72 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/MergeAstTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/MergeAstTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MergeAstTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/OrsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/OrsTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/OrsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/OrsTest.scala
index a4a06eaf156ac..333340195550b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/OrsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/OrsTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Not, Ors, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Not, Ors, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class OrsTest extends CypherFunSuite {
   private implicit val state = QueryStateHelper.empty
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PropertyValueComparisonTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PropertyValueComparisonTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PropertyValueComparisonTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PropertyValueComparisonTest.scala
index dceff7fa6f340..254a11620a364 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/PropertyValueComparisonTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/PropertyValueComparisonTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PropertyValueComparisonTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReduceTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReduceTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReduceTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReduceTest.scala
index 4bf417f212563..5c172b32ba8f8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/ReduceTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/ReduceTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.commands
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ReduceTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/RegularExpressionPredicateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/RegularExpressionPredicateTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/RegularExpressionPredicateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/RegularExpressionPredicateTest.scala
index dd93011b8225f..9b02899bf9068 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/RegularExpressionPredicateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/RegularExpressionPredicateTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Literal, Null}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{RegularExpression, LiteralRegularExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Literal, Null}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{RegularExpression, LiteralRegularExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RegularExpressionPredicateTest extends CypherFunSuite {
   test("LiteralRegEx: should not match if the lhs expression evaluates to null") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SizeFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SizeFunctionTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SizeFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SizeFunctionTest.scala
index 9405102636668..a66a7ef87b7da 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SizeFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SizeFunctionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, PathImpl, SizeFunction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, PathImpl, SizeFunction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class SizeFunctionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SplittingPredicateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SplittingPredicateTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SplittingPredicateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SplittingPredicateTest.scala
index 04ba2940ef968..0f8cc13f0c2e8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SplittingPredicateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SplittingPredicateTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SplittingPredicateTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SubtractTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SubtractTest.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SubtractTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SubtractTest.scala
index 2a4a2d84056d2..2609f91858df0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/SubtractTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/SubtractTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Literal, Subtract}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Literal, Subtract}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SubtractTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceToTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceToTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceToTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceToTest.scala
index 8fb7e5ecda41a..b0dea230a1924 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CoerceToTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CoerceToTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.Counter
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.Counter
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.language.postfixOps
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpressionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpressionTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpressionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpressionTest.scala
index 501fbb23444ac..7510e697057c7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionSliceExpressionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionSliceExpressionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CollectionSliceExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionTest.scala
index ecbaaf93a1908..0499609a55636 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/CollectionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/CollectionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CollectionTest extends CypherFunSuite {
   test("empty_collection_should_have_any_type") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndexTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndexTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndexTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndexTest.scala
index 12457dea512a7..1ffd86ab9565e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ContainerIndexTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ContainerIndexTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.{FakeExpression, SymbolTable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.{FakeExpression, SymbolTable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DivideTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DivideTest.scala
similarity index 66%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DivideTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DivideTest.scala
index bdc1bbb6f0c2e..09a55814b11a5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/DivideTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/DivideTest.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class DivideTest extends CypherFunSuite {
   test("should_throw_arithmetic_exception_for_divide_by_zero") {
     val ctx = ExecutionContext.empty
     val state = QueryStateHelper.empty
 
-    intercept[v3_0.ArithmeticException](Divide(Literal(1), Literal(0))(ctx)(state))
-    intercept[v3_0.ArithmeticException](Divide(Literal(1.4), Literal(0))(ctx)(state))
-    intercept[v3_0.ArithmeticException](Divide(Literal(1), Literal(0.0))(ctx)(state))
-    intercept[v3_0.ArithmeticException](Divide(Literal(3.4), Literal(0.0))(ctx)(state))
+    intercept[v3_1.ArithmeticException](Divide(Literal(1), Literal(0))(ctx)(state))
+    intercept[v3_1.ArithmeticException](Divide(Literal(1.4), Literal(0))(ctx)(state))
+    intercept[v3_1.ArithmeticException](Divide(Literal(1), Literal(0.0))(ctx)(state))
+    intercept[v3_1.ArithmeticException](Divide(Literal(3.4), Literal(0.0))(ctx)(state))
   }
 }
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExpressionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExpressionTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExpressionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExpressionTest.scala
index 7138f52fdabef..12992a4bf652b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExpressionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExpressionTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{CoercedPredicate, Not, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{CoercedPredicate, Not, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunctionTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunctionTest.scala
index 7f182dfe7070d..9a7ce383da87f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ExtractFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ExtractFunctionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ExtractFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FakeEntityTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FakeEntityTestSupport.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FakeEntityTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FakeEntityTestSupport.scala
index 68aae79787338..2a93c5d361bda 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/FakeEntityTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/FakeEntityTestSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import java.util
 import java.lang.Iterable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCaseTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCaseTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCaseTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCaseTest.scala
index bd8d66b1e192e..cbd49d622a757 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/GenericCaseTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/GenericCaseTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, CoercedPredicate, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, CoercedPredicate, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class GenericCaseTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunctionTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunctionTest.scala
index fa79b6d289fd0..8020cbc70b316 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/KeysFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/KeysFunctionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 class KeysFunctionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunctionTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunctionTest.scala
index 0714cd34f274a..f4d1a8a3e9be1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LabelsFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LabelsFunctionTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 class LabelsFunctionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralTest.scala
index 3ae0ce29a3757..c673bf5995d86 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LiteralTest extends CypherFunSuite {
   test("collections_should_be_typed_correctly") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImplTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImplTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImplTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImplTest.scala
index f1538a6a124e6..d724d6fdd9220 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImplTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathImplTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb._
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilderTest.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilderTest.scala
index 4b609212a0eea..81266341355f8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PathValueBuilderTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship, RelationshipType}
 
 class PathValueBuilderTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunctionTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunctionTest.scala
index 4dc7110a316db..0e96b9623d2aa 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PropertiesFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/PropertiesFunctionTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import java.util
 
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RangeFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RangeFunctionTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RangeFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RangeFunctionTest.scala
index 81588348c4d71..e49a6d959c994 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RangeFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RangeFunctionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RangeFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunctionTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunctionTest.scala
index cd758d0d071e5..c72571fced981 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/RelationshipTypeFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/RelationshipTypeFunctionTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
 import org.mockito.Matchers.any
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, EntityNotFoundException}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, EntityNotFoundException}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Relationship, RelationshipType}
 
 class RelationshipTypeFunctionTest extends CypherFunSuite with FakeEntityTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCaseTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCaseTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCaseTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCaseTest.scala
index f96e2f6ca6e60..67123b0403fb8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SimpleCaseTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SimpleCaseTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SimpleCaseTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SplitFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SplitFunctionTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SplitFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SplitFunctionTest.scala
index 82fa18bbb6649..df4f394185dc2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/SplitFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/SplitFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.FunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
 
 class SplitFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctionsTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctionsTest.scala
index 825f425b1545e..9faf8e5bf2b66 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/StringFunctionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/StringFunctionsTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StringFunctionsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunctionTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunctionTest.scala
index a0dc0f3a6f38b..7ad786599d319 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToFloatFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToFloatFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.ParameterWrongTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.ParameterWrongTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ToFloatFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunctionTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunctionTest.scala
index e98980b9386cb..99cb400153ff5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToIntFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToIntFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.{ParameterWrongTypeException, CypherTypeException}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.{ParameterWrongTypeException, CypherTypeException}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ToIntFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunctionTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunctionTest.scala
index b5cf4e30e4965..4fe7a54e3c091 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ToStringFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/ToStringFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.ParameterWrongTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.ParameterWrongTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ToStringFunctionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/groupInequalityPredicatesForLegacyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/groupInequalityPredicatesForLegacyTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/groupInequalityPredicatesForLegacyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/groupInequalityPredicatesForLegacyTest.scala
index 29f7fce098d61..67c0782894083 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/groupInequalityPredicatesForLegacyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/groupInequalityPredicatesForLegacyTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands
+package org.neo4j.cypher.internal.compiler.v3_1.commands
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class GroupInequalityPredicatesForLegacyTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyTokenTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyTokenTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyTokenTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyTokenTest.scala
index 49c05cd10fc26..78f35d9ae733b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/values/KeyTokenTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/values/KeyTokenTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.values
+package org.neo4j.cypher.internal.compiler.v3_1.commands.values
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, TokenContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, TokenContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class KeyTokenTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/AddEagernessIfNecessaryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/AddEagernessIfNecessaryTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/AddEagernessIfNecessaryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/AddEagernessIfNecessaryTest.scala
index 075c1fc689128..2db32419efa3a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/AddEagernessIfNecessaryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/AddEagernessIfNecessaryTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AddEagernessIfNecessaryTest extends CypherFunSuite {
   implicit val monitor = mock[PipeMonitor]
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForEagerLoadCsvTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForEagerLoadCsvTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForEagerLoadCsvTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForEagerLoadCsvTest.scala
index 4972f9fd18ab3..0469b072c890e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForEagerLoadCsvTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForEagerLoadCsvTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{PipeMonitor, AllNodesScanPipe, EagerPipe, HasHeaders, LoadCSVPipe}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.EagerLoadCsvNotification
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{PipeMonitor, AllNodesScanPipe, EagerPipe, HasHeaders, LoadCSVPipe}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.EagerLoadCsvNotification
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CheckForEagerLoadCsvTest extends CypherFunSuite {
   implicit val monitor = mock[PipeMonitor]
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala
index 36620f9103f64..9f6e7c0d6bbcf 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CheckForLoadCsvAndMatchOnLargeLabelTest.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import org.mockito.Mockito._
 import org.mockito.Matchers._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.commands.NodeByLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyLabel, NodeByLabelScanPipe, SingleRowPipe, NodeByLabelEntityProducer, NodeStartPipe, PipeMonitor, HasHeaders, AllNodesScanPipe, LoadCSVPipe, EagerPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext}
-import org.neo4j.cypher.internal.frontend.v3_0.LabelId
-import org.neo4j.cypher.internal.frontend.v3_0.notification.LargeLabelWithLoadCsvNotification
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.NodeByLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyLabel, NodeByLabelScanPipe, SingleRowPipe, NodeByLabelEntityProducer, NodeStartPipe, PipeMonitor, HasHeaders, AllNodesScanPipe, LoadCSVPipe, EagerPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext}
+import org.neo4j.cypher.internal.frontend.v3_1.LabelId
+import org.neo4j.cypher.internal.frontend.v3_1.notification.LargeLabelWithLoadCsvNotification
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 class CheckForLoadCsvAndMatchOnLargeLabelTest extends CypherFunSuite {
   private val THRESHOLD = 100
   private val labelOverThreshold = "A"
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResultTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResultTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResultTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResultTest.scala
index f400da8b4a295..173d3cb3fba0c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/CompiledExecutionResultTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/CompiledExecutionResultTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.util
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ResultRowImpl
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, NormalMode, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ResultRowImpl
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, NormalMode, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.helpers.collection.Iterators
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EffectsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EffectsTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EffectsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EffectsTest.scala
index d834bef6f69af..f758da6637cf0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/EffectsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/EffectsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class EffectsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionWorkflowBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionWorkflowBuilderTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionWorkflowBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionWorkflowBuilderTest.scala
index eea9c72a2acc0..623d5ce6e862a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/ExecutionWorkflowBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/ExecutionWorkflowBuilderTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.Pipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryTransactionalContext, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.Pipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryTransactionalContext, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ExecutionWorkflowBuilderTest extends CypherFunSuite {
   val PlannerName = IDPPlannerName
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/FallbackPlanBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/FallbackPlanBuilderTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/FallbackPlanBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/FallbackPlanBuilderTest.scala
index c143ed3b4c973..6c8a15dd85069 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/FallbackPlanBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/FallbackPlanBuilderTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantHandleQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.{CompilationPhaseTracer, PreparedQuerySemantics, RecordingNotificationLogger}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.PlannerUnsupportedNotification
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantHandleQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.{CompilationPhaseTracer, PreparedQuerySemantics, RecordingNotificationLogger}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.PlannerUnsupportedNotification
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FallbackPlanBuilderTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIteratorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIteratorTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIteratorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIteratorTest.scala
index d388340330f68..d6869a2667feb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvIteratorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvIteratorTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 
 class LoadCsvIteratorTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserverTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserverTest.scala
index d0d1f4063f58b..d345998fa54e2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/LoadCsvPeriodicCommitObserverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/LoadCsvPeriodicCommitObserverTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.net.URL
 
 import org.mockito.Matchers
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.ExternalCSVResource
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryTransactionalContext, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.ExternalCSVResource
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryTransactionalContext, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 class LoadCsvPeriodicCommitObserverTest extends CypherFunSuite {
 
   var resourceUnderTest: LoadCsvPeriodicCommitObserver = _
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQueryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQueryTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQueryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQueryTest.scala
index 0964041430cc7..a150ee4d03093 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PartiallySolvedQueryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PartiallySolvedQueryTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.Unsolved
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, DeleteEntityAction, MergeNodeAction, MergePatternAction}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.Unsolved
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, DeleteEntityAction, MergeNodeAction, MergePatternAction}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PartiallySolvedQueryTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprintReferenceTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprintReferenceTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprintReferenceTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprintReferenceTest.scala
index cc0ef4be82fb0..56ae8630a78f7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/PlanFingerprintReferenceTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/PlanFingerprintReferenceTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import java.util.concurrent.TimeUnit.{MILLISECONDS, SECONDS}
 
 import org.mockito.Mockito.when
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, GraphStatisticsSnapshot, NodesWithLabelCardinality}
-import org.neo4j.cypher.internal.frontend.v3_0.LabelId
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, GraphStatisticsSnapshot, NodesWithLabelCardinality}
+import org.neo4j.cypher.internal.frontend.v3_1.LabelId
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.helpers.FakeClock
 
 class PlanFingerprintReferenceTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/QueryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/QueryTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/QueryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/QueryTest.scala
index c5f4b259701ee..228f8faac2fce 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/QueryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/QueryTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{AllVariables, CreateNodeStartItem, Query}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.CreateNode
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{AllVariables, CreateNodeStartItem, Query}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.CreateNode
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/RuleExecutablePlanBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/RuleExecutablePlanBuilderTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/RuleExecutablePlanBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/RuleExecutablePlanBuilderTest.scala
index ed8cee4e2d569..ca16ae736b3d6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/RuleExecutablePlanBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/RuleExecutablePlanBuilderTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.DefaultIDPSolverConfig
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Scope, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.DefaultIDPSolverConfig
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Scope, SemanticTable}
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class RuleExecutablePlanBuilderTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilderTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilderTest.scala
index 5c371a50d33a5..2491d93f9769b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/AggregationBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/AggregationBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CountStar, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CountStar, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
 
 class AggregationBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/BuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/BuilderTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/BuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/BuilderTest.scala
index da51116e95bcc..de33fd29afad7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/BuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/BuilderTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery, PlanBuilder}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.UpdateAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.UpdateAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 trait BuilderTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilderTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilderTest.scala
index c2e67b2fe205c..e0e4088bdb55f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ColumnFilterBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ColumnFilterBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ReturnItem, Slice, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ReturnItem, Slice, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
 
 class ColumnFilterBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/CreateMissingNodesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/CreateMissingNodesTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/CreateMissingNodesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/CreateMissingNodesTest.scala
index 6def954c05214..5d91e48f8ca16 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/CreateMissingNodesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/CreateMissingNodesTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, UnresolvedLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, CreateRelationship, RelationshipEndpoint}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, UnresolvedLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, CreateRelationship, RelationshipEndpoint}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CreateMissingNodesTest extends CypherFunSuite {
   test("should_do_it_simplest_case") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DeleteAndPropertySetBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DeleteAndPropertySetBuilderTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DeleteAndPropertySetBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DeleteAndPropertySetBuilderTest.scala
index 55ac72f66086a..a36ce4cfc42d7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DeleteAndPropertySetBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DeleteAndPropertySetBuilderTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.DeleteEntityAction
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.DeleteEntityAction
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class DeleteAndPropertySetBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala
index 276ed73c56b1c..5ded2b52095de 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DisconnectedShortestPathEndPointsBuilderTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.FakePipe
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.FakePipe
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.scalatest.mock.MockitoSugar
 
 class DisconnectedShortestPathEndPointsBuilderTest extends BuilderTest with MockitoSugar {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilderTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilderTest.scala
index b1fa3b0f8b38a..0ff30f1848382 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/DistinctBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/DistinctBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ReturnItem, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.FakePipe
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ReturnItem, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.FakePipe
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class DistinctBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilderTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilderTest.scala
index e715355b20120..bc5d963b60ad0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EmptyResultBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EmptyResultBuilderTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property, RangeFunction}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ReturnItem, Slice, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, ForeachAction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EmptyResultPipe, SingleRowPipe}
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property, RangeFunction}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ReturnItem, Slice, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, ForeachAction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EmptyResultPipe, SingleRowPipe}
 
 class EmptyResultBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EntityProducerFactoryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EntityProducerFactoryTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EntityProducerFactoryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EntityProducerFactoryTest.scala
index 784a0886679fa..1b03d3fbfa9cf 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/EntityProducerFactoryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/EntityProducerFactoryTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{PlanContext, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.IndexHintException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{PlanContext, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.IndexHintException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class EntityProducerFactoryTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilderTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilderTest.scala
index 22cce2c3a8f9b..9e456e819e098 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ExtractBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ExtractBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ReturnItem
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.ExtractPipe
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ReturnItem
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.ExtractPipe
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ExtractBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilderTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilderTest.scala
index 974a63d77ef32..e68dd7fb715f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/FilterBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/FilterBuilderTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleNode
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleNode
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
 
 class FilterBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIteratorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIteratorTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIteratorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIteratorTest.scala
index a8a21871cdf12..abf2812efd079 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IfElseIteratorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IfElseIteratorTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IfElseIteratorTest extends CypherFunSuite {
   val a1 = ExecutionContext.from("a" -> 1)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilderTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilderTest.scala
index e86fc078736a7..33bb1652f8d3d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/IndexLookupBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/IndexLookupBuilderTest.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound, IndexHintException, ast}
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound, IndexHintException, ast}
 
 class IndexLookupBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilderTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilderTest.scala
index d1e4afa960f4a..f2d87c0d478d6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/LoadCSVBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/LoadCSVBuilderTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{AllVariables, LoadCSV, Query}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LoadCSVPipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{AllVariables, LoadCSV, Query}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LoadCSVPipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
 
 class LoadCSVBuilderTest extends BuilderTest {
   context = mock[PlanContext]
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilderTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilderTest.scala
index d7d7e248f52b5..635ce7b68fe0d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MatchBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MatchBuilderTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{NodeById, RelatedTo, ShortestPath, SingleNode}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.MatchPipe
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{NodeById, RelatedTo, ShortestPath, SingleNode}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.MatchPipe
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
 
 class MatchBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilderTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilderTest.scala
index 2694a2a241445..13a717a768894 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeIntoBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeIntoBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{RelatedTo, AllNodes}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{MergePatternAction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.MergeIntoPipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{RelatedTo, AllNodes}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{MergePatternAction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.MergeIntoPipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class MergeIntoBuilderTest extends BuilderTest {
   override def builder = new MergeIntoBuilder
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilderTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilderTest.scala
index 0832799cbcdd3..7c17ecd5fb3b6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/MergeStartPointBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/MergeStartPointBuilderTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.HasLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken.Unresolved
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{ForeachAction, MergeNodeAction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.FakePipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.HasLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken.Unresolved
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{ForeachAction, MergeNodeAction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.FakePipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class MergeStartPointBuilderTest extends BuilderTest {
   def builder = new MergeStartPointBuilder
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilderTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilderTest.scala
index 321b7a7ecd0ed..3d0c29e934182 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NamedPathBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NamedPathBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{NamedPath, NodeById, RelatedTo, SingleNode}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.NamedPathPipe
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{NamedPath, NodeById, RelatedTo, SingleNode}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.NamedPathPipe
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
 
 class NamedPathBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategyTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategyTest.scala
index b0ef739580ac8..7d54d93a31fad 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/NodeFetchStrategyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/NodeFetchStrategyTest.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.AnyInCollection
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Variable, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{UnresolvedLabel, UnresolvedProperty}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.AnyInCollection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Variable, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{UnresolvedLabel, UnresolvedProperty}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class NodeFetchStrategyTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilderTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilderTest.scala
index 6ca5f59dbd3eb..9c1589290e808 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PatternGraphBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PatternGraphBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.RelatedTo
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.RelatedTo
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class PatternGraphBuilderTest extends CypherFunSuite with PatternGraphBuilder {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriterTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriterTest.scala
index f7d04560e5420..89e2d66d67865 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/PredicateRewriterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/PredicateRewriterTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{UnresolvedLabel, UnresolvedProperty}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, Namer, PlanBuilder}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{UnresolvedLabel, UnresolvedProperty}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, Namer, PlanBuilder}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class PredicateRewriterTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilderTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilderTest.scala
index 736236dddcc7a..db18253a0e863 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/ShortestPathBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/ShortestPathBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class ShortestPathBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilderTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilderTest.scala
index c178577968648..291cce7831566 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SliceBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SliceBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Slice, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Slice, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
 
 class SliceBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilderTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilderTest.scala
index b93f0e185a0e1..66a6308c17d4d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/SortBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/SortBuilderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SortItem
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SortItem
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class SortBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilderTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilderTest.scala
index 69558b0ac7b80..d37397fe3ce6f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointBuilderTest.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Equals
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.NodeStartPipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound, IndexHintException}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.Equals
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.NodeStartPipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound, IndexHintException}
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class StartPointBuilderTest extends BuilderTest {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilderTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilderTest.scala
index ae0e514a1f78d..b0c6712913e98 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/StartPointChoosingBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/StartPointChoosingBuilderTest.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
 import org.mockito.Matchers
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.FakePipe
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.FakePipe
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.kernel.api.constraints.UniquenessConstraint
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopExecutablePlanBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopExecutablePlanBuilderTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopExecutablePlanBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopExecutablePlanBuilderTest.scala
index 390049bd9ebea..066b7633f9692 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TopExecutablePlanBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TopExecutablePlanBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.CountStar
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Query, SortItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{PartiallySolvedQuery, PlanBuilder}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.CountStar
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Query, SortItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{PartiallySolvedQuery, PlanBuilder}
 
 class TopExecutablePlanBuilderTest extends BuilderTest {
   def builder: PlanBuilder = new TopPipeBuilder
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilderTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilderTest.scala
index 4b3e0c6ddbfc8..9cba93c093cff 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailBuilderTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.RelationshipType.withName
 
 class TrailBuilderTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailToStepTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailToStepTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailToStepTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailToStepTest.scala
index 744a892312ccf..d1375589c5610 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/TrailToStepTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/TrailToStepTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TrailToStepTest extends CypherFunSuite {
   val A = "A"
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilderTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilderTest.scala
index b79f5336a95c5..e82295266a94c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UnwindBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UnwindBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{AllVariables, Query, ReturnItem, Unwind}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.UnwindPipe
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{AllVariables, Query, ReturnItem, Unwind}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.UnwindPipe
 
 class UnwindBuilderTest extends BuilderTest {
   val builder = new UnwindBuilder
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilderTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilderTest.scala
index f5b4107179af1..5c0a45fb3322f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateActionBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateActionBuilderTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CollectionSliceExpression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PartiallySolvedQuery
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CollectionSliceExpression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PartiallySolvedQuery
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
 
 class UpdateActionBuilderTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpanderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpanderTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpanderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpanderTest.scala
index 468a3dbc601a0..66e9226cd3d0d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/UpdateCommandExpanderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/UpdateCommandExpanderTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedLabel
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedLabel
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UpdateCommandExpanderTest extends CypherFunSuite with UpdateCommandExpander {
   // (a)-[r1]->(b), (b)-[r2]->(c), (c)-[r3]->(d)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolverTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolverTest.scala
index 3b020e91c6d4b..4e2ecc3d3f44f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/builders/prepare/KeyTokenResolverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/builders/prepare/KeyTokenResolverTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.prepare
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.prepare
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{HasLabel, StartsWith}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken.Resolved
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType, UnresolvedLabel, UnresolvedProperty}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PlanBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.{BuilderTest, Unsolved}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{HasLabel, StartsWith}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken.Resolved
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType, UnresolvedLabel, UnresolvedProperty}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PlanBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.{BuilderTest, Unsolved}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateUniqueAction, NamedExpectation, UniqueLink}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class KeyTokenResolverTest extends BuilderTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlanTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlanTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlanTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlanTest.scala
index cf4fc95026a90..18238d0a5b3dd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/ProcedureCallExecutionPlanTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/executionplan/procs/ProcedureCallExecutionPlanTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.executionplan.procs
+package org.neo4j.cypher.internal.compiler.v3_1.executionplan.procs
 
 import org.mockito.Matchers.any
 import org.mockito.Mockito.when
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.NormalMode
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, _}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, symbols}
+import org.neo4j.cypher.internal.compiler.v3_1.NormalMode
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, _}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, symbols}
 
 class ProcedureCallExecutionPlanTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMapTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMapTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMapTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMapTest.scala
index e9e8d6bc31066..913aa57f3be9a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ArrayBackedMapTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ArrayBackedMapTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ArrayBackedMapTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunctionTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunctionTest.scala
index c980b358eddea..ad75d1764801f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CachedFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CachedFunctionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CachedFunctionTest extends CypherFunSuite {
   test("does not re-calculate stuff") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CounterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CounterTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CounterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CounterTest.scala
index 91f99cafecf54..dc3c0da6b57dd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/CounterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/CounterTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CounterTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/EagerlyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/EagerlyTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/EagerlyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/EagerlyTest.scala
index 78cfa9d006af9..803f3beb1989a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/EagerlyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/EagerlyTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.{immutable, mutable}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterableTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterableTest.scala
index 596000ce20728..32e93fbf41bf1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/LazyIterableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/LazyIterableTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LazyIterableTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RowIteratorVisitationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RowIteratorVisitationTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RowIteratorVisitationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RowIteratorVisitationTest.scala
index 6d250ffe0a163..4c1beea7c2a89 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/RowIteratorVisitationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/RowIteratorVisitationTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import org.mockito.Mockito.verifyZeroInteractions
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.mutable.ArrayBuffer
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibilityTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibilityTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibilityTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibilityTest.scala
index 1c9116445226c..b280572a5bebc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScalaCompatibilityTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScalaCompatibilityTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
 import java.util
 import java.util.Arrays.asList
 import java.util.Collections.{emptyMap, emptyList, singletonMap}
 import java.util.Collections.{singleton => singletonSet}
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.ScalaCompatibility.asScalaCompatible
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.ScalaCompatibility.asScalaCompatible
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ScalaCompatibilityTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScopeTestHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScopeTestHelper.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScopeTestHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScopeTestHelper.scala
index e7e340080d697..640a76ee57bc9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ScopeTestHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ScopeTestHelper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, Scope, Symbol, SymbolUse}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, Scope, Symbol, SymbolUse}
 
 object ScopeTestHelper {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/SemanticTableHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/SemanticTableHelper.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/SemanticTableHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/SemanticTableHelper.scala
index bf9750d772b49..6e94ea0ee7fa9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/SemanticTableHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/SemanticTableHelper.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 object SemanticTableHelper {
   implicit class RichSemanticTable(table: SemanticTable) {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StatementHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StatementHelper.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StatementHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StatementHelper.scala
index bfa00a69c7ae8..5518d830deb57 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/StatementHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/StatementHelper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.{Scope, SemanticCheckResult, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.{Scope, SemanticCheckResult, SemanticState}
 import org.scalatest.Assertions
 
 object StatementHelper extends Assertions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TreeZipperTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TreeZipperTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TreeZipperTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TreeZipperTest.scala
index 47c7d319e3e31..3fb1bb55c5d82 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/TreeZipperTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/TreeZipperTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.{TreeElem, TreeZipper}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.{TreeElem, TreeZipper}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TreeZipperTest extends CypherFunSuite {
   import Tapper._
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrManyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrManyTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrManyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrManyTest.scala
index d282cc2bd5272..49993ca964ec8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/helpers/ZeroOneOrManyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/helpers/ZeroOneOrManyTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.helpers
+package org.neo4j.cypher.internal.compiler.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ZeroOneOrManyTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachActionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachActionTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachActionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachActionTest.scala
index 6b1bed232c234..1b5f00ae450e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/ForeachActionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/ForeachActionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Add, Literal, Collection, Property, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{UnresolvedLabel, UnresolvedProperty}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Add, Literal, Collection, Property, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{UnresolvedLabel, UnresolvedProperty}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ForeachActionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctionsTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctionsTest.scala
index 6c28f90a9ee54..b9ff906e3d3c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/GraphElementPropertyFunctionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/GraphElementPropertyFunctionsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class GraphElementPropertyFunctionsTest extends CypherFunSuite with GraphElementPropertyFunctions {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MakeValuesNeoSafeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MakeValuesNeoSafeTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MakeValuesNeoSafeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MakeValuesNeoSafeTest.scala
index e225d641bda70..b6871ea6e26fa 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MakeValuesNeoSafeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MakeValuesNeoSafeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MakeValuesNeoSafeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternActionNullPropertyHandlingTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternActionNullPropertyHandlingTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternActionNullPropertyHandlingTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternActionNullPropertyHandlingTest.scala
index ce9633f19f4d0..fa96134096d9f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/MergePatternActionNullPropertyHandlingTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/MergePatternActionNullPropertyHandlingTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{RelatedTo, SingleNode, VarLengthRelatedTo}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{InvalidSemanticsException, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{RelatedTo, SingleNode, VarLengthRelatedTo}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{InvalidSemanticsException, SemanticDirection}
 
 class MergePatternActionNullPropertyHandlingTest extends CypherFunSuite {
   import MergePatternAction.ensureNoNullRelationshipPropertiesInPatterns
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLinkTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLinkTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLinkTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLinkTest.scala
index 6ac77033e2f45..140c0ee4d2bf5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UniqueLinkTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UniqueLinkTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UniqueLinkTest extends CypherFunSuite {
   test("given both end nodes, only claims to write relationships, not nodes") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateActionEffectfulTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateActionEffectfulTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateActionEffectfulTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateActionEffectfulTest.scala
index c9ce542183fdc..559185603a698 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/mutation/UpdateActionEffectfulTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/mutation/UpdateActionEffectfulTest.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.mutation
+package org.neo4j.cypher.internal.compiler.v3_1.mutation
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.Query
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.devNullLogger
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.Query
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.devNullLogger
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UpdateActionEffectfulTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture.parser
+  import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture.parser
 
   test("correctly computes MergeNodeAction's effects for node property write") {
     val inner = PropertySetAction(Property(Variable("a"), PropertyKey("x")), Literal(1))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CaseExpressionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CaseExpressionTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CaseExpressionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CaseExpressionTest.scala
index 068bf25c4afa8..6ecf38c2f6e33 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CaseExpressionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CaseExpressionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => legacy, predicates}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => legacy, predicates}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest}
 import org.parboiled.scala._
 
 class CaseExpressionTest extends ParserTest[ast.Expression, legacy.Expression] with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ConstraintTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ConstraintTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ConstraintTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ConstraintTest.scala
index 60ee15339e8a2..16719e218eb18 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ConstraintTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ConstraintTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.{commands => legacyCommands, devNullLogger}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Command, ParserTest}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.{commands => legacyCommands, devNullLogger}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Command, ParserTest}
 import org.parboiled.scala._
 
 class ConstraintTest extends ParserTest[ast.Command, legacyCommands.AbstractQuery] with Command {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CypherParserTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CypherParserTest.scala
similarity index 99%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CypherParserTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CypherParserTest.scala
index 730612b52df78..d4b68454ce80f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/CypherParserTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/CypherParserTest.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
 import org.hamcrest.CoreMatchers.equalTo
 import org.junit.Assert._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.Query
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{UnresolvedLabel, TokenType, KeyToken}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.LabelSupport
-import org.neo4j.cypher.internal.compiler.v3_0.mutation._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SyntaxException}
-import org.neo4j.cypher.internal.frontend.v3_0.parser._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.Query
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{UnresolvedLabel, TokenType, KeyToken}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.LabelSupport
+import org.neo4j.cypher.internal.compiler.v3_1.mutation._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SyntaxException}
+import org.neo4j.cypher.internal.frontend.v3_1.parser._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CypherParserTest extends CypherFunSuite {
   val parser = new CypherParser
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ExpressionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ExpressionsTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ExpressionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ExpressionsTest.scala
index a821fe983e0d8..13883c5ba1e6d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ExpressionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ExpressionsTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => legacy, predicates}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest}
+package org.neo4j.cypher.internal.compiler.v3_1.parser
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => legacy, predicates}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest}
 
 // TODO: This should be tested without using the legacy expressions and moved to the semantics module
 class ExpressionsTest extends ParserTest[ast.Expression, legacy.Expression] with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ListComprehensionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ListComprehensionTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ListComprehensionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ListComprehensionTest.scala
index 7d910695e6d15..04abf69ba0361 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ListComprehensionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ListComprehensionTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.GreaterThan
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => legacy}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.GreaterThan
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => legacy}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest}
 import org.parboiled.scala._
 
 class ListComprehensionTest extends ParserTest[ast.ListComprehension, legacy.Expression] with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MapLiteralTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MapLiteralTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MapLiteralTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MapLiteralTest.scala
index d6ef749554c8c..96e391ef67bae 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MapLiteralTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MapLiteralTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => legacy}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => legacy}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest}
 import org.parboiled.scala._
 
 class MapLiteralTest extends ParserTest[ast.Expression, legacy.Expression] with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MergeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MergeTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MergeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MergeTest.scala
index 331037fec87a0..4c50314b18d4d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/MergeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/MergeTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{MergeAst, expressions}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.PropertySetAction
-import org.neo4j.cypher.internal.compiler.v3_0.{AbstractPattern, On, OnAction, ParsedEntity}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest, Query}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{MergeAst, expressions}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.PropertySetAction
+import org.neo4j.cypher.internal.compiler.v3_1.{AbstractPattern, On, OnAction, ParsedEntity}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest, Query}
 import org.parboiled.scala._
 
 class MergeTest extends ParserTest[ast.Merge, MergeAst] with Query with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ParserFixture.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ParserFixture.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ParserFixture.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ParserFixture.scala
index 95a05dc5f7bef..c529ffc70d402 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/ParserFixture.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/ParserFixture.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
 import org.scalatest.mock.MockitoSugar
 
 object ParserFixture extends MockitoSugar {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PatternPartTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PatternPartTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PatternPartTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PatternPartTest.scala
index 9d3845710b2f1..f7e97b43d027a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PatternPartTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PatternPartTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.PatternConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{Pattern => LegacyPattern, _}
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{Expressions, ParserTest, Patterns}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.PatternConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{Pattern => LegacyPattern, _}
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{Expressions, ParserTest, Patterns}
 import org.parboiled.scala._
 
 class PatternPartTest extends ParserTest[ast.PatternPart, Seq[LegacyPattern]] with Patterns with Expressions {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PeriodicCommitHintTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PeriodicCommitHintTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PeriodicCommitHintTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PeriodicCommitHintTest.scala
index a8dd9a252febf..9a876ca644842 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/parser/PeriodicCommitHintTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/parser/PeriodicCommitHintTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.parser
+package org.neo4j.cypher.internal.compiler.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{ParserTest, Query}
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{ParserTest, Query}
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, ast}
 import org.parboiled.scala._
 
 class PeriodicCommitHintTest extends ParserTest[ast.PeriodicCommitHint, Any] with Query {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipeTest.scala
index 3e4ce8012a04a..17aa1711cb4d7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/AllNodesScanPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/AllNodesScanPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
 
 class AllNodesScanPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipeTest.scala
index 84aa4520f88e9..e301e697d154f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ApplyPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ApplyPipeTest extends CypherFunSuite with PipeTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipeTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipeTest.scala
index a7711525c5250..165fdca688e67 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ArgumentPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ArgumentPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ArgumentPipeTest extends CypherFunSuite {
   implicit val pipesMonitor = mock[PipeMonitor]
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipeTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipeTest.scala
index ba426aac29572..bea50c3dfae31 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ColumnFilterPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ColumnFilterPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ReturnItem
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ReturnItem
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.mutable.Map
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala
index 5b15750f16a24..a23140afe2a80 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DirectedDirectedRelationshipByIdSeekPipeTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
 
 class DirectedDirectedRelationshipByIdSeekPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipeTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipeTest.scala
index ca549f023ea10..c236d864da34c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/DistinctPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/DistinctPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal, Multiply}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal, Multiply}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class DistinctPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipeTest.scala
index a3925e5c7db1d..9965ec72df296 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerAggregationPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerAggregationPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.frontend.v3_0.SyntaxException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.frontend.v3_1.SyntaxException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class EagerAggregationPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipeTest.scala
index a863f824cf028..9929b4d4b5ad3 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/EagerPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/EagerPipeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class EagerPipeTest extends CypherFunSuite {
   private implicit val monitor = mock[PipeMonitor]
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipeTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipeTest.scala
index dd94d11d86b16..1a0aded1a7d99 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandAllPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandAllPipeTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class ExpandAllPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipeTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipeTest.scala
index c7aa9d144301b..a340c084dadb3 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ExpandIntoPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ExpandIntoPipeTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers.{eq => mockEq, _}
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Relationship
 
 class ExpandIntoPipeTest extends CypherFunSuite with PipeTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FakePipe.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FakePipe.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FakePipe.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FakePipe.scala
index 7c17f7b0aa404..2efcc5196e38c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/FakePipe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/FakePipe.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{InternalPlanDescription, SingleRowPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{InternalPlanDescription, SingleRowPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
 import org.scalatest.mock.MockitoSugar
 
 import scala.collection.Map
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyGroupingIteratorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyGroupingIteratorTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyGroupingIteratorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyGroupingIteratorTest.scala
index b63df4b64758c..a7e3f6947ffba 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyGroupingIteratorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyGroupingIteratorTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.neo4j.collection.primitive.{PrimitiveLongIterable, PrimitiveLongSet}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LazyGroupingIteratorTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyIterator.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyIterator.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyIterator.scala
index 3e36db1661ce3..eac15d062a2f2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyIterator.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.scalatest.Assertions
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKeyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKeyTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKeyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKeyTest.scala
index 40c70afe4cb5c..e269df4608875 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyPropertyKeyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyPropertyKeyTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
-import org.neo4j.cypher.internal.frontend.v3_0.{PropertyKeyId, SemanticTable, DummyPosition}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.PropertyKeyName
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
+import org.neo4j.cypher.internal.frontend.v3_1.{PropertyKeyId, SemanticTable, DummyPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.PropertyKeyName
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.mockito.Mockito._
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypesTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypesTest.scala
index d4473559a5370..63b8a40b1e118 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LazyTypesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LazyTypesTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LazyTypesTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipeTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipeTest.scala
index f35f4878ae693..023ef5e59dcdb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSelectOrSemiApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSelectOrSemiApplyPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True, Not}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Literal, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True, Not}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Literal, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LetSelectOrSemiApplyPipeTest extends CypherFunSuite with PipeTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipeTest.scala
index cfa2511136360..273db76de7702 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/LetSemiApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/LetSemiApplyPipeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LetSemiApplyPipeTest extends CypherFunSuite with PipeTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipeTest.scala
index db5cfe5e09e2f..749b6c8437921 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MergeIntoPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MergeIntoPipeTest.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers.{any => mockAny, eq => mockEq}
 import org.mockito.Mockito
 import org.mockito.Mockito.{mock => jmock, _}
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{PropertySetAction, SetAction}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{PropertySetAction, SetAction}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.RelationshipType.withName
 import org.neo4j.graphdb.{Node, Relationship}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasherTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasherTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasherTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasherTest.scala
index 5f8525214648e..9ee602d2c76f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NiceHasherTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NiceHasherTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.FunSuite
 
 class NiceHasherTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipeTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipeTest.scala
index 57839c3900cd4..4dd8e228f344e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByIdSeekPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByIdSeekPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Literal}
 
 class NodeByIdSeekPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipeTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipeTest.scala
index 8d497569cf1ec..f9b8145da2327 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeByLabelScanPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeByLabelScanPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.LabelName
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, LabelId}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.LabelName
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, LabelId}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 class NodeByLabelScanPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipeTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipeTest.scala
index 9f2fc6d040516..970fc3318665d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeCountFromCountStorePipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeCountFromCountStorePipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.{NameId, LabelId, SemanticTable}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelName, AstConstructionTestSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.{NameId, LabelId, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelName, AstConstructionTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NodeCountFromCountStorePipeTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipeTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipeTest.scala
index f48270ab4a319..079a06fe9a137 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeHashJoinPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeHashJoinPipeTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.TestableIterator
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.TestableIterator
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 class NodeHashJoinPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipeTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipeTest.scala
index d244ae56d190e..3a709e1b44c24 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexScanPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexScanPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelToken, PropertyKeyToken, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelToken, PropertyKeyToken, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipeTest.scala
index 89672b6add45f..4faa9f803cabc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeIndexSeekPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeIndexSeekPipeTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Expression, Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, InternalException, LabelId, PropertyKeyId}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Expression, Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ManyQueryExpression, QueryExpression, RangeQueryExpression, SingleQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, InternalException, LabelId, PropertyKeyId}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.index.IndexDescriptor
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipeTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipeTest.scala
index 872ad732fe582..e6422db073652 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NodeOuterHashJoinPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NodeOuterHashJoinPipeTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.TestableIterator
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.TestableIterator
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipeTest.scala
index c8bccdbe335d7..bcb5d87aca5d7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandAllPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandAllPipeTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Not, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Not, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class OptionalExpandAllPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipeTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipeTest.scala
index a25c1e9f27731..34842d3fbce83 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalExpandIntoPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalExpandIntoPipeTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Not, Predicate, True}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Not, Predicate, True}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class OptionalExpandIntoPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipeTest.scala
index cd10ee103c500..fc364476a522f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/OptionalPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/OptionalPipeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class OptionalPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeEffectsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeEffectsTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeEffectsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeEffectsTest.scala
index 4d851123f1701..02c2cc58ad9fb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeEffectsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeEffectsTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{HasLabel, True}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{RelatedTo, ReturnItem}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{Effects, _}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, CreateRelationship, MergeNodeAction, RelationshipEndpoint}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{PatternGraph, Trail, TraversalMatcher}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{HasLabel, True}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{RelatedTo, ReturnItem}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{Effects, _}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, CreateRelationship, MergeNodeAction, RelationshipEndpoint}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{PatternGraph, Trail, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 import org.scalatest.prop.TableDrivenPropertyChecks
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeTestSupport.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeTestSupport.scala
index 1519866a3a9e8..e4505d5d45758 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/PipeTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/PipeTestSupport.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
 import org.neo4j.graphdb.{Node, Relationship}
 import org.scalatest.mock.MockitoSugar
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipeTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipeTest.scala
index 60c6706463e59..8138b70f28d7c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProcedureCallPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProcedureCallPipeTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
-
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{EagerReadWriteCallMode, LazyReadOnlyCallMode}
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
+
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{EagerReadWriteCallMode, LazyReadOnlyCallMode}
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ProcedureCallPipeTest
   extends CypherFunSuite
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipeTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipeTest.scala
index 2cd23f3a7f961..f7bdf009de0c6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProduceResultsPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProduceResultsPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ProduceResultsPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipeTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipeTest.scala
index 96b54100a4205..8a0e4235f4efd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ProjectEndpointsPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ProjectEndpointsPipeTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class ProjectEndpointsPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateHelper.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateHelper.scala
index c34a47b8a015b..717f4a9b84956 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateHelper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateTest.scala
index 1f4bfe87930a3..e703a797ee657 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/QueryStateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/QueryStateTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryStateTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipeTest.scala
index f98d4e5c69dd7..4696ce055d279 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RelationshipCountFromCountStorePipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RelationshipCountFromCountStorePipeTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.NameId._
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, RelTypeId, SemanticTable}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelName, RelTypeName, AstConstructionTestSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.NameId._
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, RelTypeId, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelName, RelTypeName, AstConstructionTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RelationshipCountFromCountStorePipeTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipeTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipeTest.scala
index ff3607614136b..de0bbb1ab5795 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RollUpApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RollUpApplyPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.mockito.Mockito._
 import org.mockito.Matchers._
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RuleSortPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RuleSortPipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RuleSortPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RuleSortPipeTest.scala
index 8e59b9eefb2fa..3dc1421b25196 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/RuleSortPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/RuleSortPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SortItem
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Add, Variable, Literal, RandFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.PatternException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SortItem
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Add, Variable, Literal, RandFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.PatternException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.mutable.{Map => MutableMap}
 import scala.util.Random
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipeTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipeTest.scala
index 082c9556e247a..0e7e43ad09bb3 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SelectOrSemiApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SelectOrSemiApplyPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True, Not}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True, Not}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SelectOrSemiApplyPipeTest extends CypherFunSuite with PipeTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipeTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipeTest.scala
index 1fb115bcc2194..965142580ad8e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SemiApplyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SemiApplyPipeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTNumber
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTNumber
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SemiApplyPipeTest extends CypherFunSuite with PipeTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPropertyPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPropertyPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPropertyPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPropertyPipeTest.scala
index d98ec26aec558..00ac961cca2e5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SetPropertyPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SetPropertyPipeTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.PropertyKeyName
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, PropertyKeyId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.PropertyKeyName
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, PropertyKeyId, SemanticTable}
 import org.neo4j.graphdb.{Node, Relationship}
 
 class SetPropertyPipeTest extends CypherFunSuite with PipeTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipeTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipeTest.scala
index 6b89ba80f7397..ca1e32f0c872c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SlicePipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SlicePipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SlicePipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipeTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipeTest.scala
index 671270ba85f63..dfad6e63ab965 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/SortPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/SortPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.junit.Assert._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.mock.MockitoSugar
 
 import scala.collection.mutable.{Map => MutableMap}
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipePlanDescriptionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipePlanDescriptionTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipePlanDescriptionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipePlanDescriptionTest.scala
index c2349992e695b..68341c299f53a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/StartPipePlanDescriptionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/StartPipePlanDescriptionTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class StartPipePlanDescriptionTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Top1WithTiesPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Top1WithTiesPipeTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Top1WithTiesPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Top1WithTiesPipeTest.scala
index c17e62cbf85df..f4957f16ae7e2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/Top1WithTiesPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/Top1WithTiesPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class Top1WithTiesPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipeTest.scala
index 3978564e0fa24..08d561bec448d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TopPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TopPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.util.Random
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipeTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipeTest.scala
index 81c19b7ae9864..54da334e09116 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/TriadicSelectionPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/TriadicSelectionPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.neo4j.collection.primitive.PrimitiveLongIterable
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb._
 import org.neo4j.kernel.impl.core.NodeProxy
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala
index 9e97a92c20a6c..4c31536611b41 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UndirectedDirectedRelationshipByIdSeekPipeTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{Operations, QueryContext}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{Operations, QueryContext}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Collection, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Collection, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
 
 class UndirectedDirectedRelationshipByIdSeekPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIteratorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIteratorTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIteratorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIteratorTest.scala
index 70c78edf7113e..7beaa217db804 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionIteratorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionIteratorTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnionIteratorTest extends CypherFunSuite {
   val state = QueryStateHelper.empty
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipeTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipeTest.scala
index ab5028ddf706b..a45e5df53e571 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnionPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnionPipeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnionPipeTest extends CypherFunSuite {
   test("union between three pipes produces expected an expected plan description") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipeTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipeTest.scala
index bf14c1a98b2a6..236f31a55af54 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/UnwindPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/UnwindPipeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnwindPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipeTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipeTest.scala
index 7f644276bf2f8..1dd3f972e64c1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ValueHashJoinPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ValueHashJoinPipeTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.TestableIterator
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.TestableIterator
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Node
 
 class ValueHashJoinPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipeTest.scala
similarity index 99%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipeTest.scala
index a38c4811dd37f..d178c61f5077e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/VarLengthExpandPipeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/VarLengthExpandPipeTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ExecutionContext
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ExecutionContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class VarLengthExpandPipeTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregateTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregateTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregateTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregateTest.scala
index 4eabc73b4ff1a..e943fb1a14576 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AggregateTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AggregateTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
 
 trait AggregateTest {
   def createAggregator(inner: Expression): AggregationFunction
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunctionTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunctionTest.scala
index 1c2f64e8695d3..17a482e8ad21d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/AvgFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/AvgFunctionTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AvgFunctionTest extends CypherFunSuite with AggregateTest {
   def createAggregator(inner: Expression) = new AvgFunction(inner)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunctionTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunctionTest.scala
index 8a24d75a1dabf..ed4e9d0ba7b51 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CollectFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CollectFunctionTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CollectFunctionTest extends CypherFunSuite with AggregateTest {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountTest.scala
index ad86664bbfc79..f179d6e9aae9b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/CountTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/CountTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CountTest extends CypherFunSuite with AggregateTest {
   def createAggregator(inner: Expression) = new CountFunction(inner)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunctionTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunctionTest.scala
index 6d923f215cbd8..34a3699120407 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MaxFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MaxFunctionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MaxFunctionTest extends CypherFunSuite with AggregateTest {
   def createAggregator(inner: Expression) = new MaxFunction(inner)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MinFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MinFunctionTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MinFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MinFunctionTest.scala
index 49def8e483f72..47e732a2f04a4 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/MinFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/MinFunctionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MinFunctionTest extends CypherFunSuite with AggregateTest {
   test("singleValueReturnsThatNumber") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunctionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunctionsTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunctionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunctionsTest.scala
index 9675e51709440..6fab43ca6e0a7 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/PercentileFunctionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/PercentileFunctionsTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal, NumericHelper}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal, NumericHelper}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 trait PercentileTest {
   def createAggregator(inner: Expression, percentile: Expression): AggregationFunction
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunctionTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunctionTest.scala
index 9b15c65154a41..adc8f3c0f5ab0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/StdevFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/StdevFunctionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, NumericHelper}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryStateHelper
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, NumericHelper}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryStateHelper
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 trait StdevTest {
   def createAggregator(inner: Expression): AggregationFunction
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunctionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunctionTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunctionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunctionTest.scala
index fe1446941a184..5d3d21bb81b59 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/aggregation/SumFunctionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/aggregation/SumFunctionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.aggregation
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.aggregation
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SumFunctionTest extends CypherFunSuite with AggregateTest {
   def createAggregator(inner: Expression) = new SumFunction(inner)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStepReversalTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStepReversalTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStepReversalTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStepReversalTest.scala
index 036ba55ca35bf..f2b9c07abe087 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/ExpanderStepReversalTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/ExpanderStepReversalTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, True, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, True, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ExpanderStepReversalTest extends CypherFunSuite {
   val A = "A"
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/HistoryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/HistoryTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/HistoryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/HistoryTest.scala
index 35487a848ba6f..f1f400312a7d4 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/HistoryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/HistoryTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{RelationshipType, Relationship}
 
 class HistoryTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationshipTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationshipTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationshipTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationshipTest.scala
index 7effcc81e6194..2aa4d9175098c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/PatternRelationshipTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/PatternRelationshipTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PatternRelationshipTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/StepSizeTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/StepSizeTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/StepSizeTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/StepSizeTest.scala
index 386bcef78dd09..4fb47181a8ff0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/StepSizeTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/StepSizeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StepSizeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthExpanderStepReversalTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthExpanderStepReversalTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthExpanderStepReversalTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthExpanderStepReversalTest.scala
index bd6012557dff7..b0fe8ab53a051 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/VariableLengthExpanderStepReversalTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/matching/VariableLengthExpanderStepReversalTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
+package org.neo4j.cypher.internal.compiler.v3_1.pipes.matching
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class VariableLengthExpanderStepReversalTest extends CypherFunSuite {
   val A = "A"
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescriptionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescriptionTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescriptionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescriptionTest.scala
index 2a18dc31418ae..d615ce6b74371 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/InternalPlanDescriptionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/InternalPlanDescriptionTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.Pipe
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.Pipe
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class InternalPlanDescriptionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializerTests.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializerTests.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializerTests.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializerTests.scala
index bdb1aca0e0e08..3b39e2982a0b2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/PlanDescriptionArgumentSerializerTests.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/PlanDescriptionArgumentSerializerTests.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{ExpandExpression,
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{ExpandExpression,
 EstimatedRows, DbHits, Rows}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PlanDescriptionArgumentSerializerTests extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderSummaryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderSummaryTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderSummaryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderSummaryTest.scala
index 079c714b824c7..1b17a7d776253 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderSummaryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderSummaryTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{SingleRowPipe, PipeMonitor}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{SingleRowPipe, PipeMonitor}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RenderSummaryTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderTreeTableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderTreeTableTest.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderTreeTableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderTreeTableTest.scala
index 9abee5fcd2b96..1db36f0022856 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planDescription/RenderTreeTableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planDescription/RenderTreeTableTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planDescription
+package org.neo4j.cypher.internal.compiler.v3_1.planDescription
 
 import java.util.Locale
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Property, LengthFunction, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, HasLabel, PropertyExists, Not}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{TokenType, KeyToken}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Property, LengthFunction, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, HasLabel, PropertyExists, Not}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{TokenType, KeyToken}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.BeforeAndAfterAll
 
 import scala.collection.immutable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/AstRewritingTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/AstRewritingTestSupport.scala
similarity index 79%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/AstRewritingTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/AstRewritingTestSupport.scala
index be64b9558717a..f61ed4b7e0fa6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/AstRewritingTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/AstRewritingTestSupport.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
 
 trait AstRewritingTestSupport extends CypherTestSupport with AstConstructionTestSupport {
   val parser = ParserFixture.parser
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/BeLikeMatcher.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/BeLikeMatcher.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/BeLikeMatcher.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/BeLikeMatcher.scala
index 4ad68c0b24ee4..bdf2fc9588a2f 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/BeLikeMatcher.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/BeLikeMatcher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CheckForUnresolvedTokensTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CheckForUnresolvedTokensTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CheckForUnresolvedTokensTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CheckForUnresolvedTokensTest.scala
index 5a3a8c16923fb..02f399e1c4c0d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/CheckForUnresolvedTokensTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/CheckForUnresolvedTokensTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Query
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{MissingLabelNotification, MissingPropertyNameNotification, MissingRelTypeNotification}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, LabelId, PropertyKeyId, RelTypeId, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Query
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{MissingLabelNotification, MissingPropertyNameNotification, MissingRelTypeNotification}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, LabelId, PropertyKeyId, RelTypeId, SemanticTable}
 
 class CheckForUnresolvedTokensTest extends CypherFunSuite with AstRewritingTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureGraphStatistics.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureGraphStatistics.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureGraphStatistics.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureGraphStatistics.scala
index 5764b4a1d7c1f..34752c7bd5685 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureGraphStatistics.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureGraphStatistics.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, NameId, PropertyKeyId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, NameId, PropertyKeyId, RelTypeId}
 import org.neo4j.kernel.impl.util.dbstructure.DbStructureLookup
 
 class DbStructureGraphStatistics(lookup: DbStructureLookup) extends GraphStatistics {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureLogicalPlanningConfiguration.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureLogicalPlanningConfiguration.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureLogicalPlanningConfiguration.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureLogicalPlanningConfiguration.scala
index 41fa786f2ed74..2564d3f175d7b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/DbStructureLogicalPlanningConfiguration.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/DbStructureLogicalPlanningConfiguration.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, StatisticsCompletingGraphStatistics}
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, RelTypeId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, StatisticsCompletingGraphStatistics}
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, RelTypeId, SemanticTable}
 import org.neo4j.helpers.collection.Pair
 import org.neo4j.helpers.collection.Visitable
 import org.neo4j.kernel.impl.util.dbstructure.{DbStructureCollector, DbStructureLookup, DbStructureVisitor}
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanConstructionTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanConstructionTestSupport.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanConstructionTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanConstructionTestSupport.scala
index 8df67c9ba4b8a..c20b91ef9de86 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanConstructionTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanConstructionTestSupport.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
 
 import scala.language.implicitConversions
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningConfiguration.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningConfiguration.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningConfiguration.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningConfiguration.scala
index 9d97959df97a2..552ea56ffe325 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningConfiguration.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningConfiguration.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cost, _}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, PropertyKeyId, LabelId}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cost, _}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, PropertyKeyId, LabelId}
 
 trait LogicalPlanningConfiguration {
   def updateSemanticTableWithTokens(in: SemanticTable): SemanticTable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport.scala
index a32af2f0261ee..60a84957402e9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport.scala
@@ -17,26 +17,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.{namePatternPredicatePatternElements, normalizeReturnClauses, normalizeWithClauses}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.execution.PipeExecutionBuilderContext
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.{DefaultIDPSolverConfig, IDPQueryGraphSolver, IDPQueryGraphSolverMonitor, SingleComponentPlanner, cartesianProductsOrValueJoins}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.LogicalPlanRewriter
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.{namePatternPredicatePatternElements, normalizeReturnClauses, normalizeWithClauses}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.execution.PipeExecutionBuilderContext
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.{DefaultIDPSolverConfig, IDPQueryGraphSolver, IDPQueryGraphSolverMonitor, SingleComponentPlanner, cartesianProductsOrValueJoins}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.LogicalPlanRewriter
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.helpers.Clock
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport2.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport2.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport2.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport2.scala
index 295647116f52f..84854d2dca25d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/LogicalPlanningTestSupport2.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/LogicalPlanningTestSupport2.scala
@@ -17,27 +17,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.EntityProducer
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, TraversalMatcher}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.QueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.{IDPQueryGraphSolver, IDPQueryGraphSolverMonitor, SingleComponentPlanner, cartesianProductsOrValueJoins}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.{LogicalPlanRewriter, unnestApply}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
-import org.neo4j.cypher.internal.frontend.v3_0.{Foldable, PropertyKeyId, SemanticTable, _}
+package org.neo4j.cypher.internal.compiler.v3_1.planner
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.EntityProducer
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.QueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.{IDPQueryGraphSolver, IDPQueryGraphSolverMonitor, SingleComponentPlanner, cartesianProductsOrValueJoins}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.{LogicalPlanRewriter, unnestApply}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.{Foldable, PropertyKeyId, SemanticTable, _}
 import org.neo4j.graphdb.Node
 import org.neo4j.helpers.collection.Visitable
 import org.neo4j.kernel.api.constraints.UniquenessConstraint
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQueryTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQueryTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQueryTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQueryTest.scala
index b8ce86d72c239..e0ed1f4c162bb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/PlannerQueryTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/PlannerQueryTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{SortItem, UnsignedDecimalIntegerLiteral, AstConstructionTestSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{LazyMode, IdName}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{SortItem, UnsignedDecimalIntegerLiteral, AstConstructionTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{LazyMode, IdName}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PlannerQueryTest extends CypherFunSuite with AstConstructionTestSupport {
   test("pair map") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraphTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraphTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraphTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraphTest.scala
index 4a5769dbf147b..dc3add72cc81e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/QueryGraphTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/QueryGraphTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryGraphTest extends CypherFunSuite {
   test("returns no pattern relationships when the query graph doesn't contain any") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/RealLogicalPlanningConfiguration.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/RealLogicalPlanningConfiguration.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/RealLogicalPlanningConfiguration.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/RealLogicalPlanningConfiguration.scala
index 3fa168461d1b8..b5b09650d1760 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/RealLogicalPlanningConfiguration.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/RealLogicalPlanningConfiguration.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.HardcodedGraphStatistics
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{CardinalityCostModel, Cost, Metrics, StatisticsBackedCardinalityModel}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.HardcodedGraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{QueryGraphCardinalityModel, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{CardinalityCostModel, Cost, Metrics, StatisticsBackedCardinalityModel}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 
 case class RealLogicalPlanningConfiguration()
   extends LogicalPlanningConfiguration with LogicalPlanningConfigurationAdHocSemanticTable {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SelectionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SelectionsTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SelectionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SelectionsTest.scala
index ea0ca896c91fb..f6ebbab86eb1b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SelectionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SelectionsTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, HasLabels, Variable, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, HasLabels, Variable, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SelectionsTest extends CypherFunSuite with LogicalPlanningTestSupport with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableBuilder.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableBuilder.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableBuilder.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableBuilder.scala
index a68ee5e2aa86c..d88b54ab4b775 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableBuilder.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableBuilder.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ASTAnnotationMap, Expression}
-import org.neo4j.cypher.internal.frontend.v3_0.{ExpressionTypeInfo, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ASTAnnotationMap, Expression}
+import org.neo4j.cypher.internal.frontend.v3_1.{ExpressionTypeInfo, SemanticTable}
 
 object SemanticTableBuilder {
   def apply() = new SemanticTableBuilder
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableTest.scala
index 27e21ffe7584c..6aa03a8642ed0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SemanticTableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SemanticTableTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ASTAnnotationMap, AstConstructionTestSupport, Expression, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{ExpressionTypeInfo, InputPosition, InternalException, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ASTAnnotationMap, AstConstructionTestSupport, Expression, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{ExpressionTypeInfo, InputPosition, InternalException, SemanticTable}
 
 class SemanticTableTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolverTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolverTest.scala
index c6b806eb3dbd5..c6675fed8c9c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/SimpleTokenResolverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/SimpleTokenResolverTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Match, Query, SingleQuery, Where, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Match, Query, SingleQuery, Where, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SimpleTokenResolverTest extends CypherFunSuite {
 
-  import org.neo4j.cypher.internal.compiler.v3_0.parser.ParserFixture._
+  import org.neo4j.cypher.internal.compiler.v3_1.parser.ParserFixture._
 
   val resolver = new SimpleTokenResolver
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/StubbedLogicalPlanningConfiguration.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/StubbedLogicalPlanningConfiguration.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/StubbedLogicalPlanningConfiguration.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/StubbedLogicalPlanningConfiguration.scala
index 8371160461420..96d0fd1c2045b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/StubbedLogicalPlanningConfiguration.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/StubbedLogicalPlanningConfiguration.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, HasLabels}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.{CardinalityModel, QueryGraphCardinalityModel, QueryGraphSolverInput}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Cost, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, LabelId}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, HasLabels}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.{CardinalityModel, QueryGraphCardinalityModel, QueryGraphSolverInput}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Cost, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, LabelId}
 
 class StubbedLogicalPlanningConfiguration(parent: LogicalPlanningConfiguration)
   extends LogicalPlanningConfiguration with LogicalPlanningConfigurationAdHocSemanticTable {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraphTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraphTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraphTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraphTest.scala
index 40a0abd23bb84..1d20111db1594 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/UpdateGraphTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/UpdateGraphTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner
+package org.neo4j.cypher.internal.compiler.v3_1.planner
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{HasLabels, In, LabelName, MapExpression, Property, PropertyKeyName, RelTypeName, SignedDecimalIntegerLiteral, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{HasLabels, In, LabelName, MapExpression, Property, PropertyKeyName, RelTypeName, SignedDecimalIntegerLiteral, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticDirection}
 
 class UpdateGraphTest extends CypherFunSuite {
   private val pos = DummyPosition(0)
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala
index 87f0524206e58..90f0bdf2b3dc5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderAcceptanceTest.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.execution
+package org.neo4j.cypher.internal.compiler.v3_1.planner.execution
 
 import org.mockito.Mockito.{verify, when, atLeastOnce}
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.KeyToken.Resolved
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{expressions => legacy}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.PipeInfo
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.KeyToken.Resolved
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{expressions => legacy}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.PipeInfo
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.helpers.Clock
 
 class PipeExecutionPlanBuilderAcceptanceTest extends CypherFunSuite with LogicalPlanningTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderTest.scala
index 5de15a6b1cda0..9f2640d601040 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/PipeExecutionPlanBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/PipeExecutionPlanBuilderTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.execution
-
-import org.neo4j.cypher.internal.compiler.v3_0.Monitors
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{FakePipe, Pipe, RonjaPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.execution
+
+import org.neo4j.cypher.internal.compiler.v3_1.Monitors
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{FakePipe, Pipe, RonjaPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.helpers.FakeClock
 
 class PipeExecutionPlanBuilderTest extends CypherFunSuite {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/convert/PathExpressionConversionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/convert/PathExpressionConversionTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/convert/PathExpressionConversionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/convert/PathExpressionConversionTest.scala
index 905cf3d026536..2273b65479ae8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/execution/convert/PathExpressionConversionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/execution/convert/PathExpressionConversionTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.execution.convert
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.ExpressionConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.ProjectedPath
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.ProjectedPath._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Variable, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, InputPosition, SemanticDirection}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.execution.convert
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.ExpressionConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.ProjectedPath
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.ProjectedPath._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Variable, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, InputPosition, SemanticDirection}
 
 class PathExpressionConversionTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/BenchmarkCardinalityEstimationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/BenchmarkCardinalityEstimationTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/BenchmarkCardinalityEstimationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/BenchmarkCardinalityEstimationTest.scala
index 2595e43ed9d4c..9c48f78ff4524 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/BenchmarkCardinalityEstimationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/BenchmarkCardinalityEstimationTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningConfiguration, QueryGraph, LogicalPlanningTestSupport2}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningConfiguration, QueryGraph, LogicalPlanningTestSupport2}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.impl.util.dbstructure.QMULDbStructure
 
 class BenchmarkCardinalityEstimationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModelTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModelTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModelTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModelTest.scala
index 60becfd37c821..5440d40761950 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalityCostModelTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalityCostModelTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{HasLabels, LabelName}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{HasLabels, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CardinalityCostModelTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalitySupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalitySupport.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalitySupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalitySupport.scala
index 6d9e53a2a8a7d..d7e26cc66ca89 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CardinalitySupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CardinalitySupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 import org.scalautils.{Tolerance, TripleEquals, Equality}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CartesianProductPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CartesianProductPlanningIntegrationTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CartesianProductPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CartesianProductPlanningIntegrationTest.scala
index 0160de830c999..587c64b43cc7a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CartesianProductPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CartesianProductPlanningIntegrationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CartesianProductPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateNodePlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateNodePlanningIntegrationTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateNodePlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateNodePlanningIntegrationTest.scala
index 58d5cbf0a29e2..60d875b81e959 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateNodePlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateNodePlanningIntegrationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CreateNodePlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateRelationshipPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
index 9a1a04690419b..76b7bf8bc8b42 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{LazyType, LazyLabel}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{LazyType, LazyLabel}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CreateRelationshipPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/DefaultQueryPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/DefaultQueryPlannerTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/DefaultQueryPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/DefaultQueryPlannerTest.scala
index 80ff153fccacc..63da68109ddfe 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/DefaultQueryPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/DefaultQueryPlannerTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 import org.mockito.Matchers.any
 import org.mockito.Mockito.{times, verify, when}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LazyMode, LogicalPlan, ProduceResult, Projection}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanningTestSupport2, PlannerQuery, QueryGraph, RegularPlannerQuery, RegularQueryProjection, UnionQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ASTAnnotationMap, Expression, Hint}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{ExpressionTypeInfo, Rewriter, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LazyMode, LogicalPlan, ProduceResult, Projection}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanningTestSupport2, PlannerQuery, QueryGraph, RegularPlannerQuery, RegularQueryProjection, UnionQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ASTAnnotationMap, Expression, Hint}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{ExpressionTypeInfo, Rewriter, SemanticTable}
 
 class DefaultQueryPlannerTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ExpandPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ExpandPlanningIntegrationTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ExpandPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ExpandPlanningIntegrationTest.scala
index d931a1a96eea3..243d0789fb3fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/ExpandPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/ExpandPlanningIntegrationTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleQueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, PlannerQuery, RegularPlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleQueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, PlannerQuery, RegularPlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, SemanticDirection}
 
 class ExpandPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/FindShortestPathsPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
index 8c65b69f6b7fc..58965e171b674 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, Variable, Not}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, Variable, Not}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FindShortestPathsPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlanningIntegrationTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlanningIntegrationTest.scala
index 69d2562e4feea..9b49bdf334fd9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LeafPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LeafPlanningIntegrationTest.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.{InequalitySeekRangeWrapper, PrefixSeekRangeWrapper}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ManyQueryExpression, RangeQueryExpression, SingleQueryExpression}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{ExclusiveBound, InclusiveBound, LabelId, PropertyKeyId}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.{InequalitySeekRangeWrapper, PrefixSeekRangeWrapper}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ManyQueryExpression, RangeQueryExpression, SingleQueryExpression}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{ExclusiveBound, InclusiveBound, LabelId, PropertyKeyId}
 
 class LeafPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescriptionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescriptionTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescriptionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescriptionTest.scala
index 761553cbfa7f7..a478ba12809c8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlan2PlanDescriptionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlan2PlanDescriptionTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.ManyQueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression, Index, KeyNames, LabelName}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{LabelName => AstLabelName, _}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.ManyQueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression, Index, KeyNames, LabelName}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{LabelName => AstLabelName, _}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.prop.TableDrivenPropertyChecks
 
 class LogicalPlan2PlanDescriptionTest extends CypherFunSuite with TableDrivenPropertyChecks {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilderTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilderTest.scala
index df6b6a525a46e..5b6fc9eaca579 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/LogicalPlanIdentificationBuilderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/LogicalPlanIdentificationBuilderTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{Apply, AllNodesScan, IdName}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{Apply, AllNodesScan, IdName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LogicalPlanIdentificationBuilderTest extends CypherFunSuite {
   val solved = CardinalityEstimation.lift(PlannerQuery.empty, Cardinality(1))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeNodePlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeNodePlanningIntegrationTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeNodePlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeNodePlanningIntegrationTest.scala
index 40f44f2745065..bb1f268d1064d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeNodePlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeNodePlanningIntegrationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Collection, In, MapExpression, Property, PropertyKeyName, SignedDecimalIntegerLiteral, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Collection, In, MapExpression, Property, PropertyKeyName, SignedDecimalIntegerLiteral, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 
 class MergeNodePlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeRelationshipPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
index d78d27b701eb7..ddd818b40cc99 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyType
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyType
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MergeRelationshipPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MetricsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MetricsTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MetricsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MetricsTest.scala
index c78e8d9cb86b3..9cb5288555b09 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/MetricsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/MetricsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MetricsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
index 876688df2d7a2..e649c996a8539 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyLabel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyLabel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NamedPathProjectionPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NodeHashJoinPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
index 7248831c7b3b4..35eb38e4afe4d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NodeHashJoinPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/OptionalMatchPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/OptionalMatchPlanningIntegrationTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/OptionalMatchPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/OptionalMatchPlanningIntegrationTest.scala
index 22841002a2db4..9888fb8305391 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/OptionalMatchPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/OptionalMatchPlanningIntegrationTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.unnestOptional
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{Limit, _}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.unnestOptional
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{Limit, _}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class OptionalMatchPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamerTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamerTest.scala
index ab9242f3aae6a..90a28fae31b70 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternExpressionPatternElementNamerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternExpressionPatternElementNamerTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PatternExpressionPatternElementNamerTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternPredicatePlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternPredicatePlanningIntegrationTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternPredicatePlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternPredicatePlanningIntegrationTest.scala
index 53a1f94f13bc6..ccc443fb361c5 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PatternPredicatePlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PatternPredicatePlanningIntegrationTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.ast.NestedPlanExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.NestedPlanExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PatternPredicatePlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PickBestPlanUsingHintsAndCostTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
index eec6888272811..36d20afc25b56 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{PropertyKeyName, LabelName, UsingIndexHint}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{LogicalPlanProducer, pickBestPlanUsingHintsAndCost}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanningTestSupport2, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{PropertyKeyName, LabelName, UsingIndexHint}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{LogicalPlanProducer, pickBestPlanUsingHintsAndCost}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanningTestSupport2, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PickBestPlanUsingHintsAndCostTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizonTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizonTest.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizonTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizonTest.scala
index 4350b2616a184..d195d2eca3dee 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanEventHorizonTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanEventHorizonTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0.ast.ResolvedCall
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{ProcedureCall, Projection, SingleRow}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, ProcedureCallProjection, RegularPlannerQuery, RegularQueryProjection}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SignedDecimalIntegerLiteral
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticTable}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1.ast.ResolvedCall
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{ProcedureCall, Projection, SingleRow}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, ProcedureCallProjection, RegularPlannerQuery, RegularQueryProjection}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SignedDecimalIntegerLiteral
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticTable}
 
 class PlanEventHorizonTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanRewritingPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanRewritingPlanningIntegrationTest.scala
similarity index 77%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanRewritingPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanRewritingPlanningIntegrationTest.scala
index 36bf5f1dd3132..ee21023b8ecae 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PlanRewritingPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PlanRewritingPlanningIntegrationTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{AllNodesScan, Projection}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
-import org.neo4j.cypher.internal.frontend.v3_0.ast.GetDegree
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{AllNodesScan, Projection}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.frontend.v3_1.ast.GetDegree
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PlanRewritingPlanningIntegrationTest  extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PriorityLeafPlannerListTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PriorityLeafPlannerListTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PriorityLeafPlannerListTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PriorityLeafPlannerListTest.scala
index e53b83ff716f6..3ea1074b6fcb8 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/PriorityLeafPlannerListTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/PriorityLeafPlannerListTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{QueryGraph, LogicalPlanningTestSupport2}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{LogicalPlan, SingleRow}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{QueryGraph, LogicalPlanningTestSupport2}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{LogicalPlan, SingleRow}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.verifyZeroInteractions
 import org.mockito.Mockito.when
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphConnectedComponentsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphConnectedComponentsTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphConnectedComponentsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphConnectedComponentsTest.scala
index 3fc0c8e47c8c2..5615582e3a13c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphConnectedComponentsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphConnectedComponentsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, ShortestPathPattern, SimplePatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, ShortestPathPattern, SimplePatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class QueryGraphConnectedComponentsTest
   extends CypherFunSuite with AstConstructionTestSupport with LogicalPlanningTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphProducer.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphProducer.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphProducer.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphProducer.scala
index c28ef168ce4cd..d42f812e84a6c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/QueryGraphProducer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/QueryGraphProducer.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Query, Statement}
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, inSequence}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.rewriters.{normalizeReturnClauses, normalizeWithClauses}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Query, Statement}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, inSequence}
 import org.scalatest.mock.MockitoSugar
 
 trait QueryGraphProducer extends MockitoSugar {
 
   self: LogicalPlanningTestSupport =>
 
-  import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.plannerQuery.StatementConverters._
+  import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.plannerQuery.StatementConverters._
 
   def producePlannerQueryForPattern(query: String): (PlannerQuery, SemanticTable) = {
     val q = query + " RETURN 1 AS Result"
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SingleRowPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SingleRowPlanningIntegrationTest.scala
similarity index 78%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SingleRowPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SingleRowPlanningIntegrationTest.scala
index 60a96b473addc..2f0d9355eee52 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SingleRowPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SingleRowPlanningIntegrationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SignedDecimalIntegerLiteral
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{Projection, SingleRow}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SignedDecimalIntegerLiteral
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{Projection, SingleRow}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SingleRowPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
   test("should build plans containing single row") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SolvablesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SolvablesTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SolvablesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SolvablesTest.scala
index 084d3d70371b5..3009c1bafac15 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/SolvablesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/SolvablesTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.QueryGraph
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.QueryGraph
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SolvablesTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModelTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModelTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModelTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModelTest.scala
index 4e6ffd1c731e4..c4d56d42bb3ed 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/StatisticsBackedCardinalityModelTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/StatisticsBackedCardinalityModelTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.CardinalityModelTestHelper
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence.AssumeIndependenceQueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.CardinalityModelTestHelper
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence.AssumeIndependenceQueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StatisticsBackedCardinalityModelTest extends CypherFunSuite with LogicalPlanningTestSupport with CardinalityModelTestHelper {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/UnionPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/UnionPlanningIntegrationTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/UnionPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/UnionPlanningIntegrationTest.scala
index 6f05c9c1b8d24..0f70b75093967 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/UnionPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/UnionPlanningIntegrationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnionPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/WithPlanningIntegrationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/WithPlanningIntegrationTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/WithPlanningIntegrationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/WithPlanningIntegrationTest.scala
index 02a4f6cf2976b..454439d998f7e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/WithPlanningIntegrationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/WithPlanningIntegrationTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{DoNotIncludeTies, AllNodesScan, Limit, Projection}
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.WindowsStringSafe
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, SignedDecimalIntegerLiteral}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{DoNotIncludeTies, AllNodesScan, Limit, Projection}
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.WindowsStringSafe
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, SignedDecimalIntegerLiteral}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class WithPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
   implicit val windowsSafe = WindowsStringSafe
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityData.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityData.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityData.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityData.scala
index 055399aa4e640..dcdb2832bf41c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityData.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityData.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.RandomizedTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.RandomizedTestSupport
 
 trait CardinalityData {
   def forQuery(testUnit: CardinalityTestHelper#TestUnit): CardinalityTestHelper#TestUnit
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityModelTestHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityModelTestHelper.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityModelTestHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityModelTestHelper.scala
index fce3c465e6675..56e7ab10a1704 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityModelTestHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityModelTestHelper.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Metrics}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Metrics}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 trait CardinalityModelTestHelper extends CardinalityTestHelper {
 
@@ -36,7 +36,7 @@ trait CardinalityModelTestHelper extends CardinalityTestHelper {
 
   implicit class RichTestUnit(testUnit: CardinalityTestHelper#TestUnit) {
     def shouldHaveQueryGraphCardinality(number: Double) {
-      import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.CardinalitySupport.Eq
+      import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.CardinalitySupport.Eq
 
       val (statistics, semanticTable) = testUnit.prepareTestContext
 
@@ -48,7 +48,7 @@ trait CardinalityModelTestHelper extends CardinalityTestHelper {
     }
 
     def shouldHavePlannerQueryCardinality(f: QueryGraphCardinalityModel => Metrics.CardinalityModel)(number: Double) {
-      import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.CardinalitySupport.Eq
+      import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.CardinalitySupport.Eq
 
       val (statistics, semanticTable) = testUnit.prepareTestContext
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityTestHelper.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityTestHelper.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityTestHelper.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityTestHelper.scala
index d768eb5685d2b..749982554149e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/CardinalityTestHelper.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/CardinalityTestHelper.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
-
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.MapSupport._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.SemanticTableHelper
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality.NumericCardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, StrictnessMode}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, QueryGraphProducer, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Variable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, RelTypeId, SemanticTable}
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
+
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.MapSupport._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.SemanticTableHelper
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality.NumericCardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, StrictnessMode}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, QueryGraphProducer, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Variable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, RelTypeId, SemanticTable}
 import org.scalatest.matchers.{MatchResult, Matcher}
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala
index 9d9fe6856e390..38b1ad576458b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/ExpressionSelectivityCalculatorTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
 import org.mockito.Mockito.when
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Selectivity
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{Predicate, Selections}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, LabelId, PropertyKeyId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Selectivity
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{Predicate, Selections}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, LabelId, PropertyKeyId, SemanticTable}
 
 class ExpressionSelectivityCalculatorTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala
index 5a9e7c1312f2f..f0bd162e97a34 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/NodeCardinalityEstimatorTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Expression, HasLabels, LabelName}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, Predicate, QueryGraph, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Expression, HasLabels, LabelName}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, Predicate, QueryGraph, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NodeCardinalityEstimatorTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala
similarity index 80%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala
index 1dada91131b08..cce10d5309748 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/RandomizedCardinalityModelTestSuite.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.RandomizedTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.RandomizedTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 abstract class RandomizedCardinalityModelTestSuite
   extends CypherFunSuite with RandomizedTestSupport with LogicalPlanningTestSupport with CardinalityModelTestHelper
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombinerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombinerTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombinerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombinerTest.scala
index 2d7e9dae931ef..c76e32211c017 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/SelectivityCombinerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/SelectivityCombinerTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Selectivity
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Selectivity
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SelectivityCombinerTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala
index c5cac77ad8acb..e18202c0702fd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/AssumeIndependenceQueryGraphCardinalityModelTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphCardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{ABCDCardinalityData, RandomizedCardinalityModelTestSuite}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphCardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{ABCDCardinalityData, RandomizedCardinalityModelTestSuite}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
 
 class AssumeIndependenceQueryGraphCardinalityModelTest extends RandomizedCardinalityModelTestSuite with ABCDCardinalityData {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala
index 03f5669037883..7fab5b661ee13 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/assumeIndependence/PatternSelectivityCalculatorTest.scala
@@ -17,20 +17,20 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.assumeIndependence
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.assumeIndependence
 
 import org.mockito.Matchers.any
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.IndependenceCombiner
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength, VarPatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanConstructionTestSupport, Predicate, Selections}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AstConstructionTestSupport, HasLabels, LabelName}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.IndependenceCombiner
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength, VarPatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanConstructionTestSupport, Predicate, Selections}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AstConstructionTestSupport, HasLabels, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, SemanticDirection, SemanticTable}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala
index 1342a4cd3f6a2..fd56c38b5d108 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/SimpleTripletCardinalityEstimatorTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.IdName
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.RandomizedTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet.TripletQueryGraphCardinalityModel.NodeCardinalities
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.IdName
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.RandomizedTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.language.implicitConversions
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverterTest.scala
similarity index 81%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverterTest.scala
index a7dc96bc674a6..6df1921f6aee9 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletConverterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletConverterTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{SpecifiedAndKnown, SpecifiedButUnknown, Unspecified}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, LabelId, RelTypeId, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{SpecifiedAndKnown, SpecifiedButUnknown, Unspecified}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, LabelId, RelTypeId, SemanticTable}
 
 class TripletConverterTest extends CypherFunSuite with LogicalPlanningTestSupport2 with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala
index 55f68ba538734..00d39565b412a 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletQueryGraphCardinalityModelTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{ForumPostsCardinalityData, RandomizedCardinalityModelTestSuite}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.GraphStatistics
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{ForumPostsCardinalityData, RandomizedCardinalityModelTestSuite}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.GraphStatistics
 
 class TripletQueryGraphCardinalityModelTest extends RandomizedCardinalityModelTestSuite with ForumPostsCardinalityData {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletTest.scala
index aeb5467223a5e..3cf80c50ce006 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/cardinality/triplet/TripletTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/cardinality/triplet/TripletTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.triplet
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.triplet
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.cardinality.{SpecifiedAndKnown, SpecifiedButUnknown, Unspecified}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.cardinality.{SpecifiedAndKnown, SpecifiedButUnknown, Unspecified}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, RelTypeId}
 
 class TripletTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala
index bef0145a73ab6..f794a5ebfbbfc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/CartesianProductsOrValueJoinsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AstConstructionTestSupport, Equals}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AstConstructionTestSupport, Equals}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CartesianProductsOrValueJoinsTest
   extends CypherFunSuite with LogicalPlanningTestSupport2 with AstConstructionTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/ExpandSolverStepTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/ExpandSolverStepTest.scala
similarity index 88%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/ExpandSolverStepTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/ExpandSolverStepTest.scala
index 06150d17807b0..7dc5a21d1a5bb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/ExpandSolverStepTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/ExpandSolverStepTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.CardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, LogicalPlanningContext, Metrics, QueryGraphSolver}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanConstructionTestSupport, PlannerQuery, QueryGraph}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SemanticTable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.CardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, LogicalPlanningContext, Metrics, QueryGraphSolver}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanConstructionTestSupport, PlannerQuery, QueryGraph}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ExpandSolverStepTest extends CypherFunSuite with LogicalPlanConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolverTest.scala
similarity index 98%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolverTest.scala
index 6deb6e2b5a736..935107c62273b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPQueryGraphSolverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPQueryGraphSolverTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import org.mockito.Mockito.{times, verify, verifyNoMoreInteractions}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, QueryGraph, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.OUTGOING
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, QueryGraph, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.OUTGOING
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.immutable
 import scala.language.reflectiveCalls
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverTest.scala
index 123ab77b68b4d..79afbf142a909 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPSolverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPSolverTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import org.mockito.Mockito.{spy, verify, verifyNoMoreInteractions}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.CardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, Metrics, ProjectingSelector, QueryGraphSolver}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.CardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, Metrics, ProjectingSelector, QueryGraphSolver}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.immutable.BitSet
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTableTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTableTest.scala
index 5d1b3b3d948fd..b46d4fe74c724 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/IDPTableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/IDPTableTest.scala
@@ -36,10 +36,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.immutable.BitSet
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/JoinSolverStepTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/JoinSolverStepTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/JoinSolverStepTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/JoinSolverStepTest.scala
index c7c10755abe93..2ce2fad688f54 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/idp/JoinSolverStepTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/idp/JoinSolverStepTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.CardinalityModel
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, NodeHashJoin, PatternRelationship, SimplePatternLength}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.LogicalPlanProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, LogicalPlanningContext, Metrics, QueryGraphSolver}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanConstructionTestSupport, PlannerQuery, RegularPlannerQuery, QueryGraph}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.CardinalityModel
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, NodeHashJoin, PatternRelationship, SimplePatternLength}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.LogicalPlanProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, LogicalPlanningContext, Metrics, QueryGraphSolver}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanConstructionTestSupport, PlannerQuery, RegularPlannerQuery, QueryGraph}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SemanticTable}
 
 class JoinSolverStepTest extends CypherFunSuite with LogicalPlanConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriterTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriterTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriterTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriterTest.scala
index 17357ece22455..eef702110af41 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/patternExpressionRewriterTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/patternExpressionRewriterTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
 
 import org.mockito.Mockito.{verify, verifyNoMoreInteractions, when}
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.ast.NestedPlanExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{AllNodesScan, IdName, LogicalPlan, Selection}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ast.NestedPlanExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{AllNodesScan, IdName, LogicalPlan, Selection}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class patternExpressionRewriterTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesLeafPlannerTest.scala
similarity index 82%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesLeafPlannerTest.scala
index ef4656f6cdb1c..11b2706162342 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/AllNodesLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/AllNodesLeafPlannerTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.PatternExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.allNodesLeafPlanner
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.PatternExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.allNodesLeafPlanner
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AllNodesLeafPlannerTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ArgumentLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ArgumentLeafPlannerTest.scala
similarity index 86%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ArgumentLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ArgumentLeafPlannerTest.scala
index bfac5c8bdeff8..446d2d7e24ecd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/ArgumentLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/ArgumentLeafPlannerTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.PatternExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.argumentLeafPlanner
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast.PatternExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.argumentLeafPlanner
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ArgumentLeafPlannerTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IdSeekLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IdSeekLeafPlannerTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IdSeekLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IdSeekLeafPlannerTest.scala
index 53bcd860e4a73..50bafb96fd1a2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IdSeekLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IdSeekLeafPlannerTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cost
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.idSeekLeafPlanner
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{RelTypeId, SemanticDirection}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cost
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.idSeekLeafPlanner
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{RelTypeId, SemanticDirection}
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexLeafPlannerTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexLeafPlannerTest.scala
index 66249fa58b033..e0bfd45584465 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexLeafPlannerTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
-
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleQueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{indexSeekLeafPlanner, mergeUniqueIndexSeekLeafPlanner, uniqueIndexSeekLeafPlanner}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
+
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleQueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{indexSeekLeafPlanner, mergeUniqueIndexSeekLeafPlanner, uniqueIndexSeekLeafPlanner}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IndexLeafPlannerTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexScanLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexScanLeafPlannerTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexScanLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexScanLeafPlannerTest.scala
index f8bbd3dc01ae2..6a0770e82aacb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexScanLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexScanLeafPlannerTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
-
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.functions
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.indexScanLeafPlanner
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
+
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.functions
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.indexScanLeafPlanner
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IndexScanLeafPlannerTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexSeekLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexSeekLeafPlannerTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexSeekLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexSeekLeafPlannerTest.scala
index 4e86279cb661c..d51988b25596d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/IndexSeekLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/IndexSeekLeafPlannerTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
-
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleQueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner.BeLikeMatcher._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.{indexSeekLeafPlanner, uniqueIndexSeekLeafPlanner}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
+
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleQueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner.BeLikeMatcher._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.{indexSeekLeafPlanner, uniqueIndexSeekLeafPlanner}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.language.reflectiveCalls
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/InequalityRangeSeekableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/InequalityRangeSeekableTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/InequalityRangeSeekableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/InequalityRangeSeekableTest.scala
index 712db75f19346..943b6e3e9e3fc 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/InequalityRangeSeekableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/InequalityRangeSeekableTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{Bound, ExclusiveBound, InclusiveBound}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{Bound, ExclusiveBound, InclusiveBound}
 
 class InequalityRangeSeekableTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LabelScanLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LabelScanLeafPlannerTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LabelScanLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LabelScanLeafPlannerTest.scala
index 15397d360c68e..1a85b3c02859e 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LabelScanLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LabelScanLeafPlannerTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyLabel
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cost
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.labelScanLeafPlanner
-import org.neo4j.cypher.internal.frontend.v3_0.LabelId
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyLabel
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cost
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.labelScanLeafPlanner
+import org.neo4j.cypher.internal.frontend.v3_1.LabelId
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.mutable
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlanTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlanTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlanTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlanTest.scala
index 0e3aba504a1d3..bbd1b534097c4 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/LogicalPlanTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/LogicalPlanTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanningTestSupport, PlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanningTestSupport, PlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LogicalPlanTest extends CypherFunSuite with LogicalPlanningTestSupport  {
   case class TestPlan()(val solved: PlannerQuery with CardinalityEstimation) extends LogicalPlan {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SargableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SargableTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SargableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SargableTest.scala
index b5adeb8c3f07f..3157fc17dc440 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/SargableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/SargableTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans
 
 import org.mockito.Mockito
-import org.neo4j.cypher.internal.compiler.v3_0.PrefixRange
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.PrefixRange
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SargableTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/FuseSelectionsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/FuseSelectionsTest.scala
similarity index 84%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/FuseSelectionsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/FuseSelectionsTest.scala
index 420b0e0ae4a1d..93d86d2475f59 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/FuseSelectionsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/FuseSelectionsTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AstConstructionTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AstConstructionTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FuseSelectionsTest extends CypherFunSuite with LogicalPlanningTestSupport with AstConstructionTestSupport {
   test("merges two selections into one") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala
index 6dc77176732c3..304d857b0ec86 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/PredicateRemovalThroughJoinsTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cardinality
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, NodeHashJoin, Selection}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, LogicalPlanningTestSupport, PlannerQuery, QueryGraph, Selections}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cardinality
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, NodeHashJoin, Selection}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, LogicalPlanningTestSupport, PlannerQuery, QueryGraph, Selections}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PredicateRemovalThroughJoinsTest extends CypherFunSuite with LogicalPlanningTestSupport {
   val aHasLabel = identHasLabel("a", "LABEL")
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/SimplifyEqualityTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/SimplifyEqualityTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/SimplifyEqualityTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/SimplifyEqualityTest.scala
index 3a2cbb2dae81e..f7fbca37e5be6 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/SimplifyEqualityTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/SimplifyEqualityTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SimplifyEqualityTest extends CypherFunSuite with LogicalPlanningTestSupport {
   test("should rewrite WHERE x.prop in [1] to WHERE x.prop = 1") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestApplyTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestApplyTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestApplyTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestApplyTest.scala
index 01844a75aa95c..b70de5a794912 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestApplyTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestApplyTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnnestApplyTest extends CypherFunSuite with LogicalPlanningTestSupport {
   test("should unnest apply with a single SingleRow on the lhs") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestOptionalTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestOptionalTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestOptionalTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestOptionalTest.scala
index d04fa2ae3240f..4b50c65b52dda 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/UnnestOptionalTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/UnnestOptionalTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.LazyType
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Equals, Property, PropertyKeyName, SignedDecimalIntegerLiteral}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.LazyType
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Equals, Property, PropertyKeyName, SignedDecimalIntegerLiteral}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class UnnestOptionalTest extends CypherFunSuite with LogicalPlanningTestSupport {
   test("should rewrite Apply/Optional/Expand to OptionalExpand when lhs of expand is single row") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEagerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEagerTest.scala
similarity index 89%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEagerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEagerTest.scala
index c63fb6733e457..b3871b2498526 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/cleanUpEagerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/cleanUpEagerTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.NoHeaders
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.StringLiteral
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.NoHeaders
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.StringLiteral
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class cleanUpEagerTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala
index 99ceeced3f8c5..ba97e65cc8033 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/plans/rewriter/removeIdenticalPlansTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class removeIdenticalPlansTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/AggregationTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/AggregationTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/AggregationTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/AggregationTest.scala
index 7964319ffbaef..bbbdbb8ef5137 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/AggregationTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/AggregationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{Aggregation, LogicalPlan, Projection}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{Aggregation, LogicalPlan, Projection}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class AggregationTest extends CypherFunSuite with LogicalPlanningTestSupport {
   val aggregatingMap: Map[String, Expression] = Map("count(*)" -> CountStar()(pos))
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ExtractBestPlanTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ExtractBestPlanTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ExtractBestPlanTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ExtractBestPlanTest.scala
index eba213b5212c4..c46160f983b47 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ExtractBestPlanTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ExtractBestPlanTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.RecordingNotificationLogger
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{IndexHintUnfulfillableNotification, JoinHintUnfulfillableNotification}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, IndexHintException, JoinHintException}
+import org.neo4j.cypher.internal.compiler.v3_1.RecordingNotificationLogger
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{IndexHintUnfulfillableNotification, JoinHintUnfulfillableNotification}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, IndexHintException, JoinHintException}
 import org.neo4j.kernel.api.index.IndexDescriptor
 
 class ExtractBestPlanTest extends CypherFunSuite with LogicalPlanningTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LegacyHintLeafPlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LegacyHintLeafPlannerTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LegacyHintLeafPlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LegacyHintLeafPlannerTest.scala
index b9d981ebeca60..5f820191f4c25 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/LegacyHintLeafPlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/LegacyHintLeafPlannerTest.scala
@@ -20,13 +20,13 @@
 package org.neo4j.cypher.internal.compiler.v2_2.planner.logical.steps
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cost
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LegacyIndexSeek, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps.legacyHintLeafPlanner
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cost
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LegacyIndexSeek, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps.legacyHintLeafPlanner
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LegacyHintLeafPlannerTest extends CypherFunSuite  with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/OuterHashJoinTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/OuterHashJoinTest.scala
similarity index 83%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/OuterHashJoinTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/OuterHashJoinTest.scala
index 9f82eb852389a..570dcd0846bb3 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/OuterHashJoinTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/OuterHashJoinTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.ast.PatternExpression
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Cost
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.ast.PatternExpression
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Cost
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class OuterHashJoinTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolverTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolverTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolverTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolverTest.scala
index 773c7af89ac5f..c84dabedddf86 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/PatternExpressionSolverTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/PatternExpressionSolverTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, QueryGraphSolver}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, QueryGraphSolver}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticDirection, SemanticTable}
 
 class PatternExpressionSolverTest extends CypherFunSuite with LogicalPlanningTestSupport {
   test("Rewrites single pattern expression") {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ProjectionTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ProjectionTest.scala
similarity index 87%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ProjectionTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ProjectionTest.scala
index c1ec9b893fe58..36eb324e9fc4c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/ProjectionTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/ProjectionTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{Ascending, SortDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, Projection}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AscSortItem
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{Ascending, SortDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, Projection}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AscSortItem
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ProjectionTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectCoveredTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectCoveredTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectCoveredTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectCoveredTest.scala
index 0f11c10820bd5..140b5663b71b1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectCoveredTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectCoveredTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SelectCoveredTest extends CypherFunSuite with LogicalPlanningTestSupport with AstConstructionTestSupport {
   private implicit val planContext = newMockedPlanContext
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectHasLabelWithJoinTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectHasLabelWithJoinTest.scala
similarity index 85%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectHasLabelWithJoinTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectHasLabelWithJoinTest.scala
index 859cc9733504b..16c0065b3a2bb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectHasLabelWithJoinTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectHasLabelWithJoinTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport2
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{NodeByLabelScan, NodeHashJoin, Selection}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{NodeByLabelScan, NodeHashJoin, Selection}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 
 class SelectHasLabelWithJoinTest extends CypherFunSuite with LogicalPlanningTestSupport2 {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectPatternPredicatesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectPatternPredicatesTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectPatternPredicatesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectPatternPredicatesTest.scala
index df4323331af80..4567181e6592c 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SelectPatternPredicatesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SelectPatternPredicatesTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Metrics.QueryGraphSolverInput
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Metrics.QueryGraphSolverInput
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, SemanticTable}
 
 class SelectPatternPredicatesTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SortSkipAndLimitTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SortSkipAndLimitTest.scala
similarity index 91%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SortSkipAndLimitTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SortSkipAndLimitTest.scala
index 7800041d67e1d..31ec78684c0f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/SortSkipAndLimitTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/SortSkipAndLimitTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Ascending, SortDescription, Cardinality, LogicalPlanningContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AscSortItem, PatternExpression}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Ascending, SortDescription, Cardinality, LogicalPlanningContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AscSortItem, PatternExpression}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class SortSkipAndLimitTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/TriadicSelectionFinderTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/TriadicSelectionFinderTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/TriadicSelectionFinderTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/TriadicSelectionFinderTest.scala
index 7edc0f451d8d9..0714049f7f5b2 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/TriadicSelectionFinderTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/TriadicSelectionFinderTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.QueryGraphProducer
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport, QueryGraph}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{INCOMING, OUTGOING}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.QueryGraphProducer
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport, QueryGraph}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TriadicSelectionFinderTest extends CypherFunSuite with LogicalPlanningTestSupport with QueryGraphProducer {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlannerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlannerTest.scala
similarity index 92%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlannerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlannerTest.scala
index 1d32f0ba75d31..f4498c3d89173 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/steps/countStorePlannerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/steps/countStorePlannerTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical.steps
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{RelationshipCountFromCountStore, NodeCountFromCountStore, IdName, LogicalPlan}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{LogicalPlanningContext, Metrics, QueryGraphProducer, QueryGraphSolver}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{AggregatingQueryProjection, LogicalPlanningTestSupport}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AstConstructionTestSupport, FunctionInvocation, FunctionName, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical.steps
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{RelationshipCountFromCountStore, NodeCountFromCountStore, IdName, LogicalPlan}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{LogicalPlanningContext, Metrics, QueryGraphProducer, QueryGraphSolver}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{AggregatingQueryProjection, LogicalPlanningTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AstConstructionTestSupport, FunctionInvocation, FunctionName, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest.matchers.{MatchResult, Matcher}
 
 class countStorePlannerTest extends CypherFunSuite with LogicalPlanningTestSupport with QueryGraphProducer with AstConstructionTestSupport {
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/unnestEagerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/unnestEagerTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/unnestEagerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/unnestEagerTest.scala
index 2d8612b444d29..29dcb02dd0341 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/planner/logical/unnestEagerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/planner/logical/unnestEagerTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.planner.logical
-
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.Eagerness.unnestEager
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{PropertyKeyName, RelTypeName}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.planner.logical
+
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.Eagerness.unnestEager
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{PropertyKeyName, RelTypeName}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class unnestEagerTest extends CypherFunSuite with LogicalPlanningTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierParserTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierParserTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierParserTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierParserTest.scala
index 7b10455b8823a..9afab8331b972 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierParserTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierParserTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.prettifier
+package org.neo4j.cypher.internal.compiler.v3_1.prettifier
 
-import org.neo4j.cypher.internal.frontend.v3_0.parser.ParserTest
+import org.neo4j.cypher.internal.frontend.v3_1.parser.ParserTest
 
 class PrettifierParserTest extends ParserTest[Seq[SyntaxToken], Seq[SyntaxToken]] {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierTest.scala
index b7377e89350a7..af26e201fca9d 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/prettifier/PrettifierTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/prettifier/PrettifierTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.prettifier
+package org.neo4j.cypher.internal.compiler.v3_1.prettifier
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class PrettifierTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/ProfilerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/ProfilerTest.scala
similarity index 93%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/ProfilerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/ProfilerTest.scala
index 3455fecdd987b..cb06549f94200 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/profiler/ProfilerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/profiler/ProfilerTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.profiler
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{NestedPipeExpression, ProjectedPath}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Effects
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Argument, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+package org.neo4j.cypher.internal.compiler.v3_1.profiler
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{NestedPipeExpression, ProjectedPath}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Effects
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Argument, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 import scala.collection.immutable.::
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResourcesTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResourcesTest.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResourcesTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResourcesTest.scala
index 32cd84c2e0b10..d07344f99cc23 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/CSVResourcesTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/CSVResourcesTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.net.URL
 
 import org.apache.commons.lang3.SystemUtils
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.TaskCloser
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.TaskCloser
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.io.fs.FileUtils
 import org.scalatest.fixture
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatisticsSnapshotTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatisticsSnapshotTest.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatisticsSnapshotTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatisticsSnapshotTest.scala
index 1aef54690acaf..8bb48731234d0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/GraphStatisticsSnapshotTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/GraphStatisticsSnapshotTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, RelTypeId}
 
 import scala.language.reflectiveCalls
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContextAdaptation.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContextAdaptation.scala
similarity index 96%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContextAdaptation.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContextAdaptation.scala
index 6975667bbaf8f..800e959559900 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/QueryContextAdaptation.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/QueryContextAdaptation.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expander, KernelPredicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expander, KernelPredicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternNode
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Node, Path, PropertyContainer, Relationship}
 import org.neo4j.kernel.api.constraints.{NodePropertyExistenceConstraint, RelationshipPropertyExistenceConstraint, UniquenessConstraint}
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContextTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContextTest.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContextTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContextTest.scala
index e08d61e34dd65..a75b55aa987a1 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/spi/UpdateCountingQueryContextTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/spi/UpdateCountingQueryContextTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.spi
+package org.neo4j.cypher.internal.compiler.v3_1.spi
 
 import org.mockito.Matchers._
 import org.mockito.Mockito.when
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.neo4j.cypher.internal.compiler.v3_0.InternalQueryStatistics
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.InternalQueryStatistics
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 import org.neo4j.kernel.api.constraints.{NodePropertyExistenceConstraint, RelationshipPropertyExistenceConstraint, UniquenessConstraint}
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTableTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTableTest.scala
similarity index 90%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTableTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTableTest.scala
index e0b62428538f0..6a172cb0ebaeb 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/symbols/SymbolTableTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/symbols/SymbolTableTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.symbols
-
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Add, Expression}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherTypeException, SyntaxException}
+package org.neo4j.cypher.internal.compiler.v3_1.symbols
+
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Add, Expression}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherTypeException, SyntaxException}
 
 class SymbolTableTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CreateTempFileTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CreateTempFileTestSupport.scala
similarity index 97%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CreateTempFileTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CreateTempFileTestSupport.scala
index b6009e9df8bae..771dbee345810 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CreateTempFileTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CreateTempFileTestSupport.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 import java.io.{FileOutputStream, OutputStreamWriter, PrintWriter}
 import java.nio.file.{Files, Path}
 import java.util.zip.{GZIPOutputStream, ZipEntry, ZipOutputStream}
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.io.fs.FileUtils
 
 import scala.io.Codec
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CustomMatchers.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CustomMatchers.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CustomMatchers.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CustomMatchers.scala
index f1865ab75480a..bc024834784f0 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/CustomMatchers.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/CustomMatchers.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 import org.scalatest.matchers.{MatchResult, Matcher}
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/RandomizedTestSupport.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/RandomizedTestSupport.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/RandomizedTestSupport.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/RandomizedTestSupport.scala
index 635912fdfa411..f18187be13102 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/RandomizedTestSupport.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/RandomizedTestSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 trait RandomizedTestSupport {
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/TestableIterator.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/TestableIterator.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/TestableIterator.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/TestableIterator.scala
index f8400d0e40cd7..9ddab14420024 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/TestableIterator.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/TestableIterator.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 class TestableIterator[A](inner: Iterator[A]) extends Iterator[A] {
   var fetched = 0
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/WindowsStringSafe.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/WindowsStringSafe.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/WindowsStringSafe.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/WindowsStringSafe.scala
index fed7475d448f8..a982073582734 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/WindowsStringSafe.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/WindowsStringSafe.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 import org.scalactic.Equality
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/testRandomizer.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/testRandomizer.scala
similarity index 95%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/testRandomizer.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/testRandomizer.scala
index 0686665bded2e..5a36a4b465afd 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/test_helpers/testRandomizer.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/test_helpers/testRandomizer.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.test_helpers
+package org.neo4j.cypher.internal.compiler.v3_1.test_helpers
 
 import scala.util.Random
 
diff --git a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencerTest.scala b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencerTest.scala
similarity index 94%
rename from community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencerTest.scala
rename to community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencerTest.scala
index 7ad1ba7b82383..98a12cb86d55b 100644
--- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/tracing/rewriters/RewriterStepSequencerTest.scala
+++ b/community/cypher/cypher-compiler-3.1/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/tracing/rewriters/RewriterStepSequencerTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters
+package org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewriter
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.Rewriter
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RewriterStepSequencerTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml
index 72eeccec706d8..b55fcdc2fc620 100644
--- a/community/cypher/cypher/pom.xml
+++ b/community/cypher/cypher/pom.xml
@@ -224,6 +224,49 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <version>3.0.0-M05</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.neo4j</groupId>
+          <artifactId>neo4j-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.neo4j</groupId>
+          <artifactId>neo4j-lucene-index</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.neo4j</groupId>
+          <artifactId>neo4j-graph-matching</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.neo4j</groupId>
+          <artifactId>neo4j-graph-algo</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scala-library</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>scala-reflect</artifactId>
+          <groupId>org.scala-lang</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.parboiled</groupId>
+          <artifactId>parboiled-scala_2.10</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.opencsv</groupId>
+          <artifactId>opencsv</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+          <artifactId>concurrentlinkedhashmap-lru</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <exclusions>
         <exclusion>
@@ -269,7 +312,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
@@ -277,7 +320,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java
index 31240becc52fa..d00a784b12e2a 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledConversionUtils.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.codegen;
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException;
-import org.neo4j.cypher.internal.frontend.v3_0.IncomparableValuesException;
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException;
+import org.neo4j.cypher.internal.frontend.v3_1.IncomparableValuesException;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.helpers.MathUtil;
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java
index 91f8abc1359b1..b6a1ed63c1f78 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledMathHelper.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.codegen;
 
-import org.neo4j.cypher.internal.frontend.v3_0.ArithmeticException;
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException;
+import org.neo4j.cypher.internal.frontend.v3_1.ArithmeticException;
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/CompilationTracer.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/CompilationTracer.java
index abb730b844a72..f7916853b3ff8 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/CompilationTracer.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/CompilationTracer.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.tracing;
 
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer;
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer;
 
 public interface CompilationTracer
 {
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/TimingCompilationTracer.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/TimingCompilationTracer.java
index 7f8ef7f777b29..981f6946d2119 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/TimingCompilationTracer.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/tracing/TimingCompilationTracer.java
@@ -23,7 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer;
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer;
 
 public class TimingCompilationTracer implements CompilationTracer
 {
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/CypherVersion.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/CypherVersion.scala
index 18575926de6d4..e438e8bf24b2b 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/CypherVersion.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/CypherVersion.scala
@@ -24,7 +24,8 @@ sealed abstract class CypherVersion(versionName: String) extends CypherOption(ve
 case object CypherVersion extends CypherOptionCompanion[CypherVersion] {
   case object v2_3 extends CypherVersion("2.3")
   case object v3_0 extends CypherVersion("3.0")
+  case object v3_1 extends CypherVersion("3.1")
 
-  val default = v3_0
-  val all: Set[CypherVersion] = Set(v2_3, v3_0)
+  val default = v3_1
+  val all: Set[CypherVersion] = Set(v2_3, v3_0, v3_1)
 }
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
index acd6136e03b78..ef5cc8d999f2f 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal
 
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.{RuntimeName, PlannerName}
+import org.neo4j.cypher.internal.compiler.v3_1.{RuntimeName, PlannerName}
 import org.neo4j.cypher.CypherVersion
 
 class AmendedRootPlanDescription(inner: ExtendedPlanDescription, version: CypherVersion, planner: PlannerName, runtime: RuntimeName)
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherCompiler.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherCompiler.scala
index f9a22c906bf07..8d26dcc3c38bd 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherCompiler.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherCompiler.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher.internal
 
 import org.neo4j.cypher.internal.compatibility.exceptionHandlerFor3_0
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 import org.neo4j.cypher.{InvalidArgumentException, SyntaxException, _}
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
 import org.neo4j.helpers.Clock
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherPreParser.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherPreParser.scala
index b27dffbc58cd3..e0f74b831cc24 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherPreParser.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherPreParser.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.parser.Base
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.parser.Base
 import org.parboiled.scala._
 
 final case class PreParsedStatement(statement: String, options: Seq[PreParserOption], offset: InputPosition)
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherStatementWithOptions.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherStatementWithOptions.scala
index 83806e3004075..afabe893a29c0 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherStatementWithOptions.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/CypherStatementWithOptions.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
 import org.neo4j.cypher.{CypherPlanner, CypherRuntime, CypherUpdateStrategy, CypherVersion, InvalidArgumentException}
 
 import scala.annotation.tailrec
@@ -44,7 +44,7 @@ object CypherStatementWithOptions {
             val newVersion = mergeOption(version, CypherVersion(v), "Can't specify multiple conflicting Cypher versions")
             recurse(tail, newVersion, planner, runtime, updateStrategy, executionMode)
           case p: PlannerPreParserOption if p.name == GreedyPlannerOption.name =>
-            throw new InvalidArgumentException("The greedy planner has been removed in Neo4j 3.0. Please use the cost planner instead.")
+            throw new InvalidArgumentException("The greedy planner has been removed in Neo4j 3.1. Please use the cost planner instead.")
           case p: PlannerPreParserOption =>
             val newPlanner = mergeOption(planner, CypherPlanner(p.name), "Can't specify multiple conflicting Cypher planners")
             recurse(tail, version, newPlanner, runtime, updateStrategy, executionMode)
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
index 63c6396e68104..1e60d359a15dd 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
@@ -23,9 +23,9 @@ import java.lang.Boolean.FALSE
 import java.util.{Map => JavaMap}
 
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{RuntimeJavaValueConverter, RuntimeScalaValueConverter}
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
-import org.neo4j.cypher.internal.compiler.v3_0.{LRUCache => LRUCachev3_0, _}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{RuntimeJavaValueConverter, RuntimeScalaValueConverter}
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier
+import org.neo4j.cypher.internal.compiler.v3_1.{LRUCache => LRUCachev3_0, _}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.tracing.{CompilationTracer, TimingCompilationTracer}
 import org.neo4j.graphdb.config.Setting
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ParsedQuery.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ParsedQuery.scala
index 95cb246fcd21e..e24632cf4a374 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ParsedQuery.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ParsedQuery.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.kernel.api.Statement
 
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlannerCache.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlannerCache.scala
index 62b174ead3674..ef5c8cc6d6250 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlannerCache.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlannerCache.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal
 
 import org.neo4j.cypher.internal.compatibility.{CompatibilityFor2_3, CompatibilityFor2_3Cost, CompatibilityFor2_3Rule, CompatibilityFor3_0, CompatibilityFor3_0Cost, CompatibilityFor3_0Rule}
-import org.neo4j.cypher.internal.compiler.v3_0.CypherCompilerConfiguration
+import org.neo4j.cypher.internal.compiler.v3_1.CypherCompilerConfiguration
 import org.neo4j.cypher.{CypherPlanner, CypherRuntime, CypherUpdateStrategy}
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.api.KernelAPI
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
index 9ffb7ec1ab861..570095e21960f 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
@@ -29,7 +29,7 @@ import org.neo4j.cypher.internal.compiler.v2_3.planDescription.{Argument, Intern
 import org.neo4j.cypher.internal.compiler.v2_3.spi.{PlanContext, QueryContext}
 import org.neo4j.cypher.internal.compiler.v2_3.tracing.rewriters.RewriterStepSequencer
 import org.neo4j.cypher.internal.compiler.v2_3.{CypherCompilerFactory, DPPlannerName, ExplainMode => ExplainModev2_3, GreedyPlannerName, IDPPlannerName, InfoLogger, Monitors, NormalMode => NormalModev2_3, PlannerName, ProfileMode => ProfileModev2_3, _}
-import org.neo4j.cypher.internal.compiler.{v2_3, v3_0}
+import org.neo4j.cypher.internal.compiler.{v2_3, v3_1}
 import org.neo4j.cypher.internal.frontend.v2_3.notification.{InternalNotification, LegacyPlannerNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
 import org.neo4j.cypher.internal.frontend.v2_3.spi.MapToPublicExceptions
 import org.neo4j.cypher.internal.frontend.v2_3.{CypherException => InternalCypherException, InputPosition => InternalInputPosition}
@@ -170,7 +170,7 @@ trait CompatibilityFor2_3 {
     new ParsedQuery {
       def isPeriodicCommit = preparedQueryForV_2_3.map(_.isPeriodicCommit).getOrElse(false)
 
-      def plan(transactionalContext: TransactionalContextWrapper, tracer: v3_0.CompilationPhaseTracer): (org.neo4j.cypher.internal.ExecutionPlan, Map[String, Any]) = exceptionHandlerFor2_3.runSafely {
+      def plan(transactionalContext: TransactionalContextWrapper, tracer: v3_1.CompilationPhaseTracer): (org.neo4j.cypher.internal.ExecutionPlan, Map[String, Any]) = exceptionHandlerFor2_3.runSafely {
         val planContext: PlanContext = new TransactionBoundPlanContext(transactionalContext)
         val (planImpl, extractedParameters) = compiler.planPreparedQuery(preparedQueryForV_2_3.get, planContext, as2_3(tracer))
 
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
index 3e27ca9be1f89..2bf433c19a291 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
@@ -24,16 +24,16 @@ import java.{lang, util}
 
 import org.neo4j.cypher._
 import org.neo4j.cypher.internal._
-import org.neo4j.cypher.internal.compiler.v3_0
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlan => ExecutionPlan_v3_0, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Argument, InternalPlanDescription, PlanDescriptionArgumentSerializer}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor}
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.compiler.v3_0.{CypherCompilerFactory, DPPlannerName, ExplainMode => ExplainModev3_0, IDPPlannerName, InfoLogger, Monitors, NormalMode => NormalModev3_0, PlannerName, ProfileMode => ProfileModev3_0, _}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.{InternalNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
-import org.neo4j.cypher.internal.frontend.v3_0.spi.MapToPublicExceptions
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherException => InternalCypherException}
+import org.neo4j.cypher.internal.compiler.v3_1
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlan => ExecutionPlan_v3_0, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Argument, InternalPlanDescription, PlanDescriptionArgumentSerializer}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.compiler.v3_1.{CypherCompilerFactory, DPPlannerName, ExplainMode => ExplainModev3_0, IDPPlannerName, InfoLogger, Monitors, NormalMode => NormalModev3_0, PlannerName, ProfileMode => ProfileModev3_0, _}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.{InternalNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
+import org.neo4j.cypher.internal.frontend.v3_1.spi.MapToPublicExceptions
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherException => InternalCypherException}
 import org.neo4j.cypher.internal.javacompat.{PlanDescription, ProfilerStatistics}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
@@ -145,13 +145,13 @@ trait CompatibilityFor3_0 {
   val kernelAPI: KernelAPI
 
   protected val rewriterSequencer: (String) => RewriterStepSequencer = {
-    import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer._
+    import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer._
     import org.neo4j.helpers.Assertion._
 
     if (assertionsEnabled()) newValidating else newPlain
   }
 
-  protected val compiler: v3_0.CypherCompiler
+  protected val compiler: v3_1.CypherCompiler
 
   implicit val executionMonitor = kernelMonitors.newMonitor(classOf[QueryExecutionMonitor])
 
@@ -407,7 +407,7 @@ case class ExecutionResultWrapperFor3_0(inner: InternalExecutionResult, planner:
     getClass.getName + "@" + Integer.toHexString(hashCode())
   }
 
-  private implicit class ConvertibleCompilerInputPosition(pos: frontend.v3_0.InputPosition) {
+  private implicit class ConvertibleCompilerInputPosition(pos: frontend.v3_1.InputPosition) {
     def asInputPosition = new InputPosition(pos.offset, pos.line, pos.column)
   }
 
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ExceptionTranslatingQueryContextFor3_0.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ExceptionTranslatingQueryContextFor3_0.scala
index 2c8381338d712..444b1cd9ffeb0 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ExceptionTranslatingQueryContextFor3_0.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ExceptionTranslatingQueryContextFor3_0.scala
@@ -21,10 +21,10 @@ package org.neo4j.cypher.internal.compatibility
 
 import java.net.URL
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expander, KernelPredicate}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expander, KernelPredicate}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternNode
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.cypher.internal.spi.v3_0.ExceptionTranslationSupport
 import org.neo4j.graphdb.{Node, Path, PropertyContainer, Relationship}
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/helpers/wrappersFor2_3.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/helpers/wrappersFor2_3.scala
index bf5f01da84613..2f36373215e34 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/helpers/wrappersFor2_3.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/helpers/wrappersFor2_3.scala
@@ -23,12 +23,12 @@ import org.neo4j.cypher.InternalException
 import org.neo4j.cypher.internal.compiler.v2_3
 import org.neo4j.cypher.internal.compiler.v2_3.CompilationPhaseTracer.CompilationPhaseEvent
 import org.neo4j.cypher.internal.compiler.v2_3.{CypherCompilerConfiguration => CypherCompilerConfiguration2_3}
-import org.neo4j.cypher.internal.compiler.v3_0.{CompilationPhaseTracer, CypherCompilerConfiguration}
+import org.neo4j.cypher.internal.compiler.v3_1.{CompilationPhaseTracer, CypherCompilerConfiguration}
 import org.neo4j.cypher.internal.frontend.v2_3.{InputPosition => InputPosition2_3}
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 /**
-  * Contains necessary wrappers for supporting 2.3 in 3.0
+  * Contains necessary wrappers for supporting 2.3 in 3.1
   */
 object wrappersFor2_3 {
 
@@ -42,21 +42,21 @@ object wrappersFor2_3 {
       override def beginPhase(phase: v2_3.CompilationPhaseTracer.CompilationPhase) = {
         val wrappedPhase =
           if (phase == v2_3.CompilationPhaseTracer.CompilationPhase.AST_REWRITE)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.AST_REWRITE
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.AST_REWRITE
           else if (phase == v2_3.CompilationPhaseTracer.CompilationPhase
             .CODE_GENERATION)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.CODE_GENERATION
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.CODE_GENERATION
           else if (phase == v2_3.CompilationPhaseTracer.CompilationPhase
             .LOGICAL_PLANNING)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
           else if (phase == v2_3.CompilationPhaseTracer.CompilationPhase.PARSING)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.PARSING
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.PARSING
           else if (phase == v2_3.CompilationPhaseTracer.CompilationPhase
             .PIPE_BUILDING)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.PIPE_BUILDING
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.PIPE_BUILDING
           else if (phase == v2_3.CompilationPhaseTracer.CompilationPhase
             .SEMANTIC_CHECK)
-            org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.SEMANTIC_CHECK
+            org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.SEMANTIC_CHECK
           else throw new InternalException(s"Cannot handle $phase in 2.3")
 
         val wrappedEvent = tracer.beginPhase(wrappedPhase)
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapper.scala
index d8ec429bb8c57..3d324af38c523 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapper.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapper.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.spi
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryTransactionalContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryTransactionalContext
 import org.neo4j.graphdb.{Lock, PropertyContainer}
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.api.KernelTransaction.Revertable
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/HardcodedGraphStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/HardcodedGraphStatistics.scala
index 9b4d204a5471d..d04352d681b95 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/HardcodedGraphStatistics.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/HardcodedGraphStatistics.scala
@@ -22,4 +22,4 @@ package org.neo4j.cypher.internal.spi.v2_3
 //This class should live here, but until we have to touch
 //disk, let's have it in the compiler. Convenient.
 case object HardcodedGraphStatistics
-  extends org.neo4j.cypher.internal.compiler.v3_0.HardcodedGraphStatisticsValues
+  extends org.neo4j.cypher.internal.compiler.v3_1.HardcodedGraphStatisticsValues
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundTokenContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundTokenContext.scala
index e4f10ac72987b..6bb495d48e9d2 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundTokenContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundTokenContext.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.spi.v2_3
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
 import org.neo4j.kernel.api.Statement
 import org.neo4j.kernel.api.exceptions.{LabelNotFoundKernelException, PropertyKeyNotFoundException, RelationshipTypeNotFoundException}
 import org.neo4j.kernel.impl.api.operations.KeyReadOperations
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/BidirectionalTraversalMatcher.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/BidirectionalTraversalMatcher.scala
index 06fc110f76d42..ae8c25716be46 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/BidirectionalTraversalMatcher.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/BidirectionalTraversalMatcher.scala
@@ -21,10 +21,10 @@ package org.neo4j.cypher.internal.spi.v3_0
 
 import java.util.function.Predicate
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, TraversalMatcher, TraversalPathExpander}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EntityProducer, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, TraversalMatcher, TraversalPathExpander}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EntityProducer, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
 import org.neo4j.graphdb.traversal.{BranchCollisionPolicy, _}
 import org.neo4j.graphdb.{Node, Path}
 import org.neo4j.graphdb.impl.traversal.StandardBranchCollisionDetector
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslatingPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslatingPlanContext.scala
index aed2e7c8b6be4..a23e223d1923f 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslatingPlanContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslatingPlanContext.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.internal.spi.v3_0
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.EntityProducer
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, TraversalMatcher}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.EntityProducer
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, TraversalMatcher}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, PlanContext, ProcedureSignature, QualifiedProcedureName}
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.constraints.UniquenessConstraint
 import org.neo4j.kernel.api.index.IndexDescriptor
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslationSupport.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslationSupport.scala
index b0490aaa9f7a1..8c58a8cedfc0c 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslationSupport.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/ExceptionTranslationSupport.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.spi.v3_0
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
 import org.neo4j.cypher.{ConstraintValidationException, CypherExecutionException}
 import org.neo4j.graphdb.{ConstraintViolationException => KernelConstraintViolationException}
 import org.neo4j.kernel.api.TokenNameLookup
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/GeneratedQueryStructure.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/GeneratedQueryStructure.scala
index 30d57a06de961..19068bab8efb5 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/GeneratedQueryStructure.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/GeneratedQueryStructure.scala
@@ -32,16 +32,16 @@ import org.neo4j.collection.primitive.hopscotch.LongKeyIntValueTable
 import org.neo4j.collection.primitive.{Primitive, PrimitiveLongIntMap, PrimitiveLongIterator, PrimitiveLongObjectMap}
 import org.neo4j.cypher.internal.codegen.CompiledConversionUtils.CompositeKey
 import org.neo4j.cypher.internal.codegen.{CompiledConversionUtils, CompiledExpandUtils, CompiledMathHelper, NodeIdWrapper, RelationshipIdWrapper}
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.DirectionConverter
-import org.neo4j.cypher.internal.compiler.v3_0.codegen._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CantCompileQueryException
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultVisitor, QueryContext, QueryTransactionalContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{ExecutionMode, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherExecutionException, ParameterNotFoundException, SemanticDirection, symbols}
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.DirectionConverter
+import org.neo4j.cypher.internal.compiler.v3_1.codegen._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.helpers._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CantCompileQueryException
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultVisitor, QueryContext, QueryTransactionalContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{ExecutionMode, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherExecutionException, ParameterNotFoundException, SemanticDirection, symbols}
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
 import org.neo4j.graphdb.{Direction, Node, Relationship}
 import org.neo4j.helpers.collection.MapUtil
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/HardcodedGraphStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/HardcodedGraphStatistics.scala
index ca8b1ad09030a..435870366d451 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/HardcodedGraphStatistics.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/HardcodedGraphStatistics.scala
@@ -22,4 +22,4 @@ package org.neo4j.cypher.internal.spi.v3_0
 //This class should live here, but until we have to touch
 //disk, let's have it in the compiler. Convenient.
 case object HardcodedGraphStatistics
-  extends org.neo4j.cypher.internal.compiler.v3_0.HardcodedGraphStatisticsValues
+  extends org.neo4j.cypher.internal.compiler.v3_1.HardcodedGraphStatisticsValues
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/MonodirectionalTraversalMatcher.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/MonodirectionalTraversalMatcher.scala
index e82c155b4bcdd..564c753e1ac33 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/MonodirectionalTraversalMatcher.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/MonodirectionalTraversalMatcher.scala
@@ -19,10 +19,10 @@
  */
 package org.neo4j.cypher.internal.spi.v3_0
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, TraversalMatcher, TraversalPathExpander}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{EntityProducer, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, TraversalMatcher, TraversalPathExpander}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{EntityProducer, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
 import org.neo4j.graphdb.traversal._
 import org.neo4j.graphdb.{Node, Path}
 import org.neo4j.kernel.{Traversal, Uniqueness}
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundGraphStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundGraphStatistics.scala
index 8c330b385c654..cd5ba358824d6 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundGraphStatistics.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundGraphStatistics.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.internal.spi.v3_0
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, Selectivity}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, StatisticsCompletingGraphStatistics}
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, NameId, PropertyKeyId, RelTypeId}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, Selectivity}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, StatisticsCompletingGraphStatistics}
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, NameId, PropertyKeyId, RelTypeId}
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException
 import org.neo4j.kernel.api.index.IndexDescriptor
 import org.neo4j.kernel.api.{Statement => KernelStatement, ReadOperations}
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala
index 222cdcfab3b14..fe14514de7ff5 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundPlanContext.scala
@@ -21,11 +21,11 @@ package org.neo4j.cypher.internal.spi.v3_0
 
 import org.neo4j.cypher.MissingIndexException
 import org.neo4j.cypher.internal.LastCommittedTxIdProvider
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.EntityProducer
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.ExpanderStep
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CypherType
-import org.neo4j.cypher.internal.frontend.v3_0.{CypherExecutionException, symbols}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.EntityProducer
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.ExpanderStep
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CypherType
+import org.neo4j.cypher.internal.frontend.v3_1.{CypherExecutionException, symbols}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.constraints.UniquenessConstraint
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
index e4a26f3294491..e5b1d15cbaa93 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
@@ -25,16 +25,16 @@ import java.util.function.Predicate
 import org.neo4j.collection.RawIterator
 import org.neo4j.collection.primitive.PrimitiveLongIterator
 import org.neo4j.collection.primitive.base.Empty.EMPTY_PRIMITIVE_LONG_COLLECTION
-import org.neo4j.cypher.internal.compiler.v3_0.MinMaxOrdering.{BY_NUMBER, BY_STRING, BY_VALUE}
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.DirectionConverter.toGraphDb
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{KernelPredicate, OnlyDirectionExpander, TypeAndDirectionExpander}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.JavaConversionSupport
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.JavaConversionSupport._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
-import org.neo4j.cypher.internal.compiler.v3_0.spi._
-import org.neo4j.cypher.internal.frontend.v3_0.{Bound, EntityNotFoundException, FailedIndexException, SemanticDirection, spi => frontend}
+import org.neo4j.cypher.internal.compiler.v3_1.MinMaxOrdering.{BY_NUMBER, BY_STRING, BY_VALUE}
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.DirectionConverter.toGraphDb
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{KernelPredicate, OnlyDirectionExpander, TypeAndDirectionExpander}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.JavaConversionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.JavaConversionSupport._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternNode
+import org.neo4j.cypher.internal.compiler.v3_1.spi._
+import org.neo4j.cypher.internal.frontend.v3_1.{Bound, EntityNotFoundException, FailedIndexException, SemanticDirection, spi => frontend}
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.spi.{BeansAPIRelationshipIterator, TransactionalContextWrapper}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundTokenContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundTokenContext.scala
index 8613cb9f0349f..3df511c056e8b 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundTokenContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundTokenContext.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.spi.v3_0
 
-import org.neo4j.cypher.internal.compiler.v3_0.spi.TokenContext
+import org.neo4j.cypher.internal.compiler.v3_1.spi.TokenContext
 import org.neo4j.kernel.api.Statement
 import org.neo4j.kernel.api.exceptions.{LabelNotFoundKernelException, PropertyKeyNotFoundException, RelationshipTypeNotFoundException}
 import org.neo4j.kernel.impl.api.operations.KeyReadOperations
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
index 5555bf2991372..8503476cea1c6 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
@@ -23,7 +23,7 @@ import java.util.Collections
 
 import org.mockito.Mockito._
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.kernel.GraphDatabaseQueryService
@@ -207,6 +207,67 @@ class QueryExecutionMonitorTest extends CypherFunSuite with GraphIcing {
     verify(monitor, times(1)).endSuccess(session)
   }
 
+  test("triggering monitor in 3.0") {
+    // given
+    val session = graph.session()
+
+    // when
+    val result = engine.profile("CYPHER 3.0 RETURN [1, 2, 3, 4, 5]", Map.empty[String, Any], session).javaIterator
+
+    //then
+    verify(monitor, times(1)).startQueryExecution(session, "CYPHER 3.0 RETURN [1, 2, 3, 4, 5]", Collections.emptyMap())
+    while (result.hasNext) {
+      verify(monitor, never).endSuccess(session)
+      result.next()
+    }
+    verify(monitor, times(1)).endSuccess(session)
+  }
+
+  test("monitor is called when iterator closes in 3.0") {
+    // given
+    val session = graph.session()
+
+    // when
+    val result = engine.execute("CYPHER 3,0 RETURN 42", Map.empty[String, Any], session).javaIterator.close()
+
+    // then
+    verify(monitor, times(1)).startQueryExecution(session, "CYPHER 3.0 RETURN 42", Collections.emptyMap())
+    verify(monitor, times(1)).endSuccess(session)
+  }
+
+  test("monitor is called when next on empty iterator in 3.0") {
+    // given
+    val session = graph.session()
+
+    // when
+    val iterator = engine.execute("CYPHER 3.0 RETURN 42", Map.empty[String, Any], session).javaIterator
+    iterator.next()
+    var throwable: Throwable = null
+    try {
+      iterator.next()
+      fail("we expect an exception here")
+    }
+    catch {
+      case e: Throwable => throwable = e
+    }
+
+    // then
+    verify(monitor, times(1)).startQueryExecution(session, "CYPHER 3.0 RETURN 42", Collections.emptyMap())
+    verify(monitor, times(1)).endFailure(session, throwable)
+  }
+
+  test("monitor is called directly when return is empty in 3.0") {
+    // given
+    val session = graph.session()
+
+    // when
+    val result = engine.execute("CYPHER 3.0 CREATE()", Map.empty[String, Any], session).javaIterator
+
+    // then
+    verify(monitor, times(1)).startQueryExecution(session, "CYPHER 3.0 CREATE()", Collections.emptyMap())
+    verify(monitor, times(1)).endSuccess(session)
+  }
+
   var graph: GraphDatabaseQueryService = null
   var monitor: QueryExecutionMonitor = null
   var engine: ExecutionEngine = null
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java
index fcabed5cccb33..f5a3237b2546b 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryInvalidationIT.java
@@ -27,8 +27,8 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.neo4j.cypher.internal.compiler.v3_0.CypherCacheHitMonitor;
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Query;
+import org.neo4j.cypher.internal.compiler.v3_1.CypherCacheHitMonitor;
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Query;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/CypherStatementWithOptionsTest.scala b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/CypherStatementWithOptionsTest.scala
index 25450450fe332..0d52682f61e1b 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/CypherStatementWithOptionsTest.scala
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/CypherStatementWithOptionsTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal
 
 import org.neo4j.cypher.InvalidArgumentException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CypherStatementWithOptionsTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CartesianProductNotificationAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CartesianProductNotificationAcceptanceTest.scala
index 981e338fb5b62..a817a8a229313 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CartesianProductNotificationAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CartesianProductNotificationAcceptanceTest.scala
@@ -22,11 +22,11 @@ package org.neo4j.cypher
 import org.mockito.Matchers._
 import org.mockito.Mockito.{verify, _}
 import org.neo4j.cypher.internal.compatibility._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.notification.CartesianProductNotification
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.notification.CartesianProductNotification
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.spi.v3_0.GeneratedQueryStructure
 import org.neo4j.helpers.Clock
 import org.neo4j.logging.NullLog
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CypherCompatibilityTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CypherCompatibilityTest.scala
index 4409a08d5c7ea..f8c4054d37131 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CypherCompatibilityTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/CypherCompatibilityTest.scala
@@ -38,6 +38,8 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
     execute(s"CYPHER 2.3 $query").columnAs[Long]("count(*)").next() shouldBe 1
     execute(s"CYPHER 3.0 planner=rule $query").columnAs[Long]("count(*)").next() shouldBe 1
     execute(s"CYPHER 3.0 $query").columnAs[Long]("count(*)").next() shouldBe 1
+    execute(s"CYPHER 3.1 planner=rule $query").columnAs[Long]("count(*)").next() shouldBe 1
+    execute(s"CYPHER 3.1 $query").columnAs[Long]("count(*)").next() shouldBe 1
   }
 
   test("should be able to switch between versions") {
@@ -45,12 +47,14 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
       db =>
         db.execute(s"CYPHER 2.3 $QUERY").asScala.toList shouldBe empty
         db.execute(s"CYPHER 3.0 $QUERY").asScala.toList shouldBe empty
+        db.execute(s"CYPHER 3.1 $QUERY").asScala.toList shouldBe empty
     }
   }
 
   test("should be able to switch between versions2") {
     runWithConfig() {
       db =>
+        db.execute(s"CYPHER 3.1 $QUERY").asScala.toList shouldBe empty
         db.execute(s"CYPHER 3.0 $QUERY").asScala.toList shouldBe empty
         db.execute(s"CYPHER 2.3 $QUERY").asScala.toList shouldBe empty
     }
@@ -59,12 +63,12 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
   test("should be able to override config") {
     runWithConfig(GraphDatabaseSettings.cypher_parser_version -> "2.3") {
       db =>
-        db.execute(s"CYPHER 3.0 $QUERY").asScala.toList shouldBe empty
+        db.execute(s"CYPHER 3.1 $QUERY").asScala.toList shouldBe empty
     }
   }
 
   test("should be able to override config2") {
-    runWithConfig(GraphDatabaseSettings.cypher_parser_version -> "3.0") {
+    runWithConfig(GraphDatabaseSettings.cypher_parser_version -> "3.1") {
       db =>
         db.execute(s"CYPHER 2.3 $QUERY").asScala.toList shouldBe empty
     }
@@ -75,7 +79,7 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
       db =>
         val result = db.execute(QUERY)
         result.asScala.toList shouldBe empty
-        result.getExecutionPlanDescription.getArguments.get("version") should equal("CYPHER 3.0")
+        result.getExecutionPlanDescription.getArguments.get("version") should equal("CYPHER 3.1")
     }
   }
 
@@ -93,6 +97,7 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
       engine =>
         assertProfiled(engine, "CYPHER 2.3 runtime=interpreted PROFILE MATCH (n) RETURN n")
         assertProfiled(engine, "CYPHER 3.0 runtime=interpreted PROFILE MATCH (n) RETURN n")
+        assertProfiled(engine, "CYPHER 3.1 runtime=interpreted PROFILE MATCH (n) RETURN n")
     }
   }
 
@@ -101,6 +106,7 @@ class CypherCompatibilityTest extends ExecutionEngineFunSuite with RunWithConfig
       engine =>
         assertExplained(engine, "CYPHER 2.3 EXPLAIN MATCH (n) RETURN n")
         assertExplained(engine, "CYPHER 3.0 EXPLAIN MATCH (n) RETURN n")
+        assertExplained(engine, "CYPHER 3.1 EXPLAIN MATCH (n) RETURN n")
     }
   }
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/EagerizationAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/EagerizationAcceptanceTest.scala
index e9d7eb2533690..e8f2f35222ff7 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/EagerizationAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/EagerizationAcceptanceTest.scala
@@ -20,9 +20,9 @@
 package org.neo4j.cypher
 
 import org.neo4j.collection.RawIterator
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.Counter
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.Counter
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.exceptions.ProcedureException
 import org.neo4j.kernel.api.proc.CallableProcedure.{BasicProcedure, Context}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala
index b97847a1c728e..1dd01e8d283ec 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala
@@ -22,8 +22,8 @@ package org.neo4j.cypher
 import org.apache.commons.lang3.SystemUtils
 import org.hamcrest.CoreMatchers._
 import org.junit.Assert._
-import org.neo4j.cypher.internal.compiler.v3_0.CypherSerializer
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper
+import org.neo4j.cypher.internal.compiler.v3_1.CypherSerializer
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper
 
 class ErrorMessagesTest extends ExecutionEngineFunSuite with CypherSerializer {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineIT.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineIT.scala
index 1ff42256dff7b..eaa61e2c48f37 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineIT.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineIT.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher
 
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.compiler.v3_0.CostBasedPlannerName
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.CostBasedPlannerName
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
@@ -68,6 +68,24 @@ class ExecutionEngineIT extends CypherFunSuite with GraphIcing {
     plan2.getArguments.get("planner-impl") should equal(CostBasedPlannerName.default.name)
   }
 
+  test("by default when using cypher 3.1 some queries should default to COST") {
+    //given
+    val db = new TestGraphDatabaseFactory()
+      .newImpermanentDatabaseBuilder()
+      .setConfig(GraphDatabaseSettings.cypher_parser_version, "3.1").newGraphDatabase()
+    val service = new GraphDatabaseCypherService(db)
+
+    //when
+    val plan1 = service.planDescriptionForQuery("PROFILE MATCH (a) RETURN a")
+    val plan2 = service.planDescriptionForQuery("PROFILE MATCH (a)-[:T*]-(a) RETURN a")
+
+    //then
+    plan1.getArguments.get("planner") should equal("COST")
+    plan1.getArguments.get("planner-impl") should equal(CostBasedPlannerName.default.name)
+    plan2.getArguments.get("planner") should equal("COST")
+    plan2.getArguments.get("planner-impl") should equal(CostBasedPlannerName.default.name)
+  }
+
   test("should be able to set RULE as default when using cypher 2.3") {
     //given
     val db = new TestGraphDatabaseFactory()
@@ -100,6 +118,22 @@ class ExecutionEngineIT extends CypherFunSuite with GraphIcing {
     plan.getArguments.get("planner-impl") should equal("RULE")
   }
 
+  test("should be able to set RULE as default when using cypher 3.1") {
+    //given
+    val db = new TestGraphDatabaseFactory()
+      .newImpermanentDatabaseBuilder()
+      .setConfig(GraphDatabaseSettings.cypher_planner, "RULE")
+      .setConfig(GraphDatabaseSettings.cypher_parser_version, "3.1").newGraphDatabase()
+    val service = new GraphDatabaseCypherService(db)
+
+    //when
+    val plan = service.planDescriptionForQuery("PROFILE MATCH (a) RETURN a")
+
+    //then
+    plan.getArguments.get("planner") should equal("RULE")
+    plan.getArguments.get("planner-impl") should equal("RULE")
+  }
+
   test("should be able to force COST as default when using cypher 2.3") {
     //given
     val db = new TestGraphDatabaseFactory()
@@ -132,6 +166,22 @@ class ExecutionEngineIT extends CypherFunSuite with GraphIcing {
     plan.getArguments.get("planner-impl") should equal("IDP")
   }
 
+  test("should be able to force COST as default when using cypher 3.1") {
+    //given
+    val db = new TestGraphDatabaseFactory()
+      .newImpermanentDatabaseBuilder()
+      .setConfig(GraphDatabaseSettings.cypher_planner, "COST")
+      .setConfig(GraphDatabaseSettings.cypher_parser_version, "3.1").newGraphDatabase()
+    val service = new GraphDatabaseCypherService(db)
+
+    //when
+    val plan = service.planDescriptionForQuery("PROFILE MATCH (a)-[:T*]-(a) RETURN a")
+
+    //then
+    plan.getArguments.get("planner") should equal("COST")
+    plan.getArguments.get("planner-impl") should equal("IDP")
+  }
+
   test("should work if query cache size is set to zero") {
     //given
     val db = new TestGraphDatabaseFactory()
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
index 77532f9c48beb..c72efb72308c6 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
@@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit
 
 import jdk.nashorn.internal.runtime.ScriptRuntime
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
 import org.neo4j.cypher.internal.tracing.TimingCompilationTracer
 import org.neo4j.cypher.internal.tracing.TimingCompilationTracer.QueryEvent
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTestSupport.scala
index 8f44f8052f81c..f6b8c0ec53ff0 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTestSupport.scala
@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit
 
 import org.hamcrest.CoreMatchers._
 import org.junit.Assert._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExplainAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExplainAcceptanceTest.scala
index 15ecf0e447028..29810ab880ce6 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExplainAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExplainAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.MergePattern
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.MergePattern
 
 class ExplainAcceptanceTest extends ExecutionEngineFunSuite {
   test("normal query is marked as such") {
@@ -38,7 +38,7 @@ class ExplainAcceptanceTest extends ExecutionEngineFunSuite {
     result should be(empty)
   }
 
-  test("EXPLAIN for Cypher 3.0") {
+  test("EXPLAIN for Cypher 3.1") {
     val result = eengine.execute("explain match (n) return n", Map.empty[String, Object], graph.session())
     result.toList
     assert(result.planDescriptionRequested, "result not marked with planDescriptionRequested")
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
index a56c53fc52237..4dc55fb052a1b 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
@@ -20,10 +20,10 @@
 package org.neo4j.cypher
 
 import org.mockito.Mockito.when
-import org.neo4j.cypher.internal.compiler.v3_0.CypherCompilerConfiguration
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.DefaultIDPSolverConfig
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.CypherCompilerConfiguration
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.DefaultIDPSolverConfig
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundPlanContext
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/JoinHintPlanningIntegrationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/JoinHintPlanningIntegrationTest.scala
index 29156cb11582b..0c258550c3cc4 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/JoinHintPlanningIntegrationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/JoinHintPlanningIntegrationTest.scala
@@ -19,12 +19,12 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.QueryGraphSolver
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{IdName, LogicalPlan, NodeHashJoin}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable.FoldableAny
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.QueryGraphSolver
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{IdName, LogicalPlan, NodeHashJoin}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{LogicalPlanningTestSupport2, RegularPlannerQuery}
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable.FoldableAny
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalacheck.Gen
 
 import scala.util.Random
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/LdbcAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/LdbcAcceptanceTest.scala
index b624f4c0cea9f..74ab8cce3df8a 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/LdbcAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/LdbcAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.EstimatedRows
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.EstimatedRows
 import org.neo4j.kernel.impl.query.QueryEngineProvider
 
 /**
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/MutatingIntegrationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/MutatingIntegrationTest.scala
index 5e0767d11de15..53796ff36988b 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/MutatingIntegrationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/MutatingIntegrationTest.scala
@@ -239,7 +239,7 @@ class MutatingIntegrationTest extends ExecutionEngineFunSuite with Assertions wi
     try {
       updateWithBothPlannersAndCompatibilityMode("create (a {params1}), (b {params2})", "params1" -> maps1, "params2" -> maps2)
     } catch {
-      case e: CypherTypeException => e.getCause shouldBe a [org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException]
+      case e: CypherTypeException => e.getCause shouldBe a [org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException]
       case e: ParameterWrongTypeException => e.getCause shouldBe a [org.neo4j.cypher.internal.frontend.v2_3.ParameterWrongTypeException]
     }
   }
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NewPlannerTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NewPlannerTestSupport.scala
index d594f3201e0ec..dbb3578ce75a8 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NewPlannerTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NewPlannerTestSupport.scala
@@ -23,12 +23,12 @@ import org.neo4j.cypher.NewPlannerMonitor.{NewPlannerMonitorCall, NewQuerySeen,
 import org.neo4j.cypher.NewRuntimeMonitor.{NewPlanSeen, NewRuntimeMonitorCall, UnableToCompileQuery}
 import org.neo4j.cypher.internal.RewindableExecutionResult
 import org.neo4j.cypher.internal.compatibility.{ExecutionResultWrapperFor2_3, ExecutionResultWrapperFor3_0}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalExecutionResult, NewLogicalPlanSuccessRateMonitor, NewRuntimeSuccessRateMonitor}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CantCompileQueryException, CantHandleQueryException}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalExecutionResult, NewLogicalPlanSuccessRateMonitor, NewRuntimeSuccessRateMonitor}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CantCompileQueryException, CantHandleQueryException}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
 import org.neo4j.graphdb.config.Setting
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
 import org.neo4j.helpers.Exceptions
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NodeIndexSeekByRangeAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NodeIndexSeekByRangeAcceptanceTest.scala
index 04262875f2b35..f183a5ee410b2 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NodeIndexSeekByRangeAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NodeIndexSeekByRangeAcceptanceTest.scala
@@ -19,12 +19,12 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
 
 /**
  * These tests are testing the actual index implementation, thus they should all check the actual result.
  * If you only want to verify that plans using indexes are actually planned, please use
- * [[org.neo4j.cypher.internal.compiler.v3_0.planner.logical.LeafPlanningIntegrationTest]]
+ * [[org.neo4j.cypher.internal.compiler.v3_1.planner.logical.LeafPlanningIntegrationTest]]
  */
 class NodeIndexSeekByRangeAcceptanceTest extends ExecutionEngineFunSuite with NewPlannerTestSupport{
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NotificationAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NotificationAcceptanceTest.scala
index 15a01bcef3ee4..e18dd1c3dbbc5 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NotificationAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/NotificationAcceptanceTest.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.notification._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.notification._
 
 class NotificationAcceptanceTest extends ExecutionEngineFunSuite with NewPlannerTestSupport {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/PatternGen.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/PatternGen.scala
index ffb995308aa78..57ee6dc23c360 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/PatternGen.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/PatternGen.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, INCOMING, OUTGOING}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING, OUTGOING}
 import org.scalacheck.Gen._
 import org.scalacheck.{Gen, Shrink}
 import org.scalatest.prop.PropertyChecks
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ProfilerAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ProfilerAcceptanceTest.scala
index 6776d09abea65..95894bc67d1d0 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ProfilerAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ProfilerAcceptanceTest.scala
@@ -19,14 +19,14 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{DbHits, EstimatedRows, Rows, Signature}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Argument, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QualifiedProcedureName, GraphStatistics}
-import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{DbHits, EstimatedRows, Rows, Signature}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Argument, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QualifiedProcedureName, GraphStatistics}
+import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.cypher.internal.helpers.TxCounts
 import org.neo4j.graphdb.QueryExecutionException
 
@@ -138,6 +138,13 @@ class ProfilerAcceptanceTest extends ExecutionEngineFunSuite with CreateTempFile
     result.getExecutionPlanDescription.toString should include("DB Hits")
   }
 
+  test("PROFILE for Cypher 3,0") {
+    val result = graph.execute("cypher 3.0 profile match (n) where (n)-[:FOO]->() return *")
+
+    assert(result.getQueryExecutionType.requestedExecutionPlanDescription, "result not marked with planDescriptionRequested")
+    result.getExecutionPlanDescription.toString should include("DB Hits")
+  }
+
   test("match (n) where not (n)-[:FOO]->() return *") {
     //GIVEN
     relate( createNode(), createNode(), "FOO")
@@ -647,7 +654,7 @@ class ProfilerAcceptanceTest extends ExecutionEngineFunSuite with CreateTempFile
   def profileWithPlanner(planner: Planner, q: String, params: (String, Any)*): InternalExecutionResult = {
     val result = planner("profile " + q, params)
     assert(result.planDescriptionRequested, "result not marked with planDescriptionRequested")
-    val planDescription: v3_0.planDescription.InternalPlanDescription = result.executionPlanDescription()
+    val planDescription: v3_1.planDescription.InternalPlanDescription = result.executionPlanDescription()
     planDescription.flatten.foreach {
       p =>
         if (!p.arguments.exists(_.isInstanceOf[DbHits])) {
@@ -666,11 +673,11 @@ class ProfilerAcceptanceTest extends ExecutionEngineFunSuite with CreateTempFile
 
   def legacyProfile(q: String, params: (String, Any)*): InternalExecutionResult = profileWithPlanner(innerExecute(_,_:_*), q, params:_*)
 
-  private def getArgument[A <: Argument](plan: v3_0.planDescription.InternalPlanDescription)(implicit manifest: ClassTag[A]): A = plan.arguments.collectFirst {
+  private def getArgument[A <: Argument](plan: v3_1.planDescription.InternalPlanDescription)(implicit manifest: ClassTag[A]): A = plan.arguments.collectFirst {
     case x: A => x
   }.getOrElse(fail(s"Failed to find plan description argument where expected. Wanted ${manifest.toString()} but only found ${plan.arguments}"))
 
-  private def getPlanDescriptions(result: InternalExecutionResult, names: Seq[String]): Seq[v3_0.planDescription.InternalPlanDescription] = {
+  private def getPlanDescriptions(result: InternalExecutionResult, names: Seq[String]): Seq[v3_1.planDescription.InternalPlanDescription] = {
     result.toList
     val description = result.executionPlanDescription()
     if (names.isEmpty)
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala
index e8cf2dda72720..3d5f497e3d468 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryCachingTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher
 
 import org.neo4j.cypher.internal.StringCacheMonitor
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.Label
 import org.neo4j.kernel.api.Statement
 import org.scalatest.prop.TableDrivenPropertyChecks
@@ -67,9 +67,9 @@ class QueryCachingTest extends CypherFunSuite with GraphDatabaseTestSupport with
         val actual = cacheListener.trace
         val expected = List(
           s"cacheFlushDetected",
-          s"cacheMiss: CYPHER 3.0 $query",
-          s"cacheHit: CYPHER 3.0 $query",
-          s"cacheHit: CYPHER 3.0 $query")
+          s"cacheMiss: CYPHER 3.1 $query",
+          s"cacheHit: CYPHER 3.1 $query",
+          s"cacheHit: CYPHER 3.1 $query")
 
         actual should equal(expected)
     }
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
index b6a1e71cb42eb..a4d0be7e518bc 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
@@ -23,8 +23,8 @@ import java.util
 
 import org.neo4j.cypher.internal.QueryStatistics
 import org.neo4j.cypher.internal.compatibility.ExecutionResultWrapperFor3_0
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.{CompiledRuntimeName, CostBasedPlannerName}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.{CompiledRuntimeName, CostBasedPlannerName}
 import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, QuerySession}
 import org.scalatest.Assertions
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RewindableExecutionResultAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RewindableExecutionResultAcceptanceTest.scala
index d794886862e15..da72109ccc7d6 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RewindableExecutionResultAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RewindableExecutionResultAcceptanceTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher
 
 import org.neo4j.cypher.internal.RewindableExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.graphdb.Node
 
 class RewindableExecutionResultAcceptanceTest extends ExecutionEngineFunSuite {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RootPlanAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RootPlanAcceptanceTest.scala
index 67816744fb3f7..88394ed7a9f9c 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RootPlanAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/RootPlanAcceptanceTest.scala
@@ -19,41 +19,41 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0._
+import org.neo4j.cypher.internal.compiler.v3_1._
 import scala.collection.JavaConverters._
 
 class RootPlanAcceptanceTest extends ExecutionEngineFunSuite {
 
-  test("cost should be default planner in 3.0") {
+  test("cost should be default planner in 3.1") {
     given("match (n) return n")
-      .withCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
-  test("interpreted should be default runtime in 3.0") {
+  test("interpreted should be default runtime in 3.1") {
     given("match (n) return n")
-      .withCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
       .shouldHaveRuntime(InterpretedRuntimeName)
   }
 
-  test("should use cost for varlength in 3.0") {
+  test("should use cost for varlength in 3.1") {
     given("match (a)-[r:T1*]->(b) return a,r,b")
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
-  test("should use cost for cycles in 3.0") {
+  test("should use cost for cycles in 3.1") {
     given("match (a)-[r]->(a) return a")
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
-  test("should handle updates in 3.0") {
+  test("should handle updates in 3.1") {
     given("create() return 1")
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
@@ -62,9 +62,9 @@ class RootPlanAcceptanceTest extends ExecutionEngineFunSuite {
       """MATCH p=(n:Person {first_name: 'Shawna'})-[:FRIEND_OF]-(m:Person)
         |RETURN p UNION MATCH p=(n:Person {first_name: 'Shawna'})-[:FRIEND_OF]-()-[:FRIEND_OF]-(m:Person) RETURN p"""
         .stripMargin)
-      .withCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
       .withPlanner(RulePlannerName)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(RulePlannerName)
   }
 
@@ -75,8 +75,8 @@ class RootPlanAcceptanceTest extends ExecutionEngineFunSuite {
         |RETURN coc, COUNT(*) AS times
         |ORDER BY times DESC
         |LIMIT 10""".stripMargin)
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
@@ -85,31 +85,31 @@ class RootPlanAcceptanceTest extends ExecutionEngineFunSuite {
       """MATCH (s:Location {name:'DeliverySegment-257227'}), (e:Location {name:'DeliverySegment-476821'})
         |MATCH (s)<-[:DELIVERY_ROUTE]-(db1) MATCH (db2)-[:DELIVERY_ROUTE]->(e)
         |MATCH (db1)<-[:CONNECTED_TO]-()-[:CONNECTED_TO]-(db2) RETURN s""".stripMargin)
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
 
   test("query that does not go through the compiled runtime") {
     given("MATCH (n) RETURN n, count(*)")
-      .withCypherVersion(CypherVersion.v3_0)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHaveRuntime(InterpretedRuntimeName)
   }
 
   test("query that lacks support from the compiled runtime") {
     given("CREATE ()")
-      .withCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
       .withRuntime(CompiledRuntimeName)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHaveRuntime(InterpretedRuntimeName)
   }
 
   test("query that should go through the compiled runtime") {
     given("MATCH (a)-->(b) RETURN a")
-      .withCypherVersion(CypherVersion.v3_0)
+      .withCypherVersion(CypherVersion.v3_1)
       .withRuntime(CompiledRuntimeName)
-      .shouldHaveCypherVersion(CypherVersion.v3_0)
+      .shouldHaveCypherVersion(CypherVersion.v3_1)
       .shouldHaveRuntime(CompiledRuntimeName)
       .shouldHavePlanner(CostBasedPlannerName.default)
   }
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticCreateAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticCreateAcceptanceTest.scala
index 2c157c74de486..7daebe43c2ebc 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticCreateAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticCreateAcceptanceTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher
 
 import org.junit.Ignore
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.scalacheck.{Shrink, Gen}
 
 /*
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticDeleteAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticDeleteAcceptanceTest.scala
index d2439cfe7ec29..d5b90a66165c0 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticDeleteAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticDeleteAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.scalacheck.{Shrink, Gen}
 
 /*
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticErrorAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticErrorAcceptanceTest.scala
index 071de0fbc1785..75cc6adba7d38 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticErrorAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticErrorAcceptanceTest.scala
@@ -667,7 +667,7 @@ class SemanticErrorAcceptanceTest extends ExecutionEngineFunSuite {
   }
 
   def executeAndEnsureError(query: String, expected: String, params: (String,Any)*) {
-    import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper._
+    import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper._
 
     import scala.collection.JavaConverters._
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticMergeAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticMergeAcceptanceTest.scala
index 9a26f9d77855b..3c276608018cc 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticMergeAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SemanticMergeAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.scalacheck.{Gen, Shrink}
 
 /*
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupport.scala
index 3fbc01fc01159..2b90ece2f08f2 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupport.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
 
 trait SystemPropertyTestSupport {
   self: CypherTestSupport =>
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupportTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupportTest.scala
index 370ea95d7754f..f731145b8df7f 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupportTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/SystemPropertyTestSupportTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher
 
 import java.util.Properties
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 
 class SystemPropertyTestSupportTest extends CypherFunSuite
 {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TestSuites.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TestSuites.scala
index 6f93eb737a515..f9b0482ccf291 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TestSuites.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TestSuites.scala
@@ -20,9 +20,9 @@
 package org.neo4j.cypher
 
 import org.neo4j.cypher.internal.ExtendedExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Result, Node, PropertyContainer}
 import org.neo4j.kernel.api.exceptions.Status
 import org.scalatest.matchers.{MatchResult, Matcher}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TxCountsTrackingTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TxCountsTrackingTestSupport.scala
index fe50d6a0c7ea7..d7d8893bddc82 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TxCountsTrackingTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/TxCountsTrackingTestSupport.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.{CypherFunSuite, CypherTestSupport}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.helpers.TxCounts
 
 trait TxCountsTrackingTestSupport extends CypherTestSupport {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintValidationAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintValidationAcceptanceTest.scala
index ce3ebd6aa2016..5ef6f6bc34242 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintValidationAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintValidationAcceptanceTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher
 
 import org.junit.Assert._
 import org.hamcrest.CoreMatchers._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 
 class UniqueConstraintValidationAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsTestSupport with  CollectionSupport {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintVerificationAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintVerificationAcceptanceTest.scala
index c6c9383b044dc..0b857e3481577 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintVerificationAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/UniqueConstraintVerificationAcceptanceTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 
 import collection.JavaConverters._
 import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/VarLengthAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/VarLengthAcceptanceTest.scala
index 8916e817601c9..410c8542513ad 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/VarLengthAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/VarLengthAcceptanceTest.scala
@@ -19,10 +19,10 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.NoneInCollection
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.LegacyExpression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.NoneInCollection
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.LegacyExpression
 import org.neo4j.graphdb.{Direction, Node}
 import org.neo4j.graphdb.Direction._
 import org.scalatest.matchers.{MatchResult, Matcher}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
index 76e4a2892fdf5..4eb8d87e1c1e2 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.kernel.NeoStoreDataSource
 import org.neo4j.kernel.api.KernelTransaction
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala
index 70c35711be2fe..55cf92714ecf8 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala
@@ -25,13 +25,13 @@ import java.util
 import org.neo4j.cypher.InternalException
 import org.neo4j.cypher.internal.compatibility.{ExecutionResultWrapperFor2_3, ExecutionResultWrapperFor3_0, exceptionHandlerFor2_3, exceptionHandlerFor3_0}
 import org.neo4j.cypher.internal.compiler.v2_3
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{InternalExecutionResult, READ_WRITE, _}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Argument, Children, Id, InternalPlanDescription, NoChildren, PlanDescriptionImpl, SingleChild, TwoChildren}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultVisitor
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{InternalExecutionResult, READ_WRITE, _}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Argument, Children, Id, InternalPlanDescription, NoChildren, PlanDescriptionImpl, SingleChild, TwoChildren}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultVisitor
 import org.neo4j.cypher.internal.frontend.v2_3.{notification => notification_2_3}
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, notification}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, notification}
 import org.neo4j.graphdb.{QueryExecutionType, ResourceIterator}
 
 object RewindableExecutionResult {
@@ -175,9 +175,9 @@ object RewindableExecutionResult {
       case notification_2_3.MissingPropertyNameNotification(position, name) => notification.MissingPropertyNameNotification(lift(position), name)
       case notification_2_3.UnboundedShortestPathNotification(position) => notification.UnboundedShortestPathNotification(lift(position))
       case notification_2_3.LegacyPlannerNotification =>
-        null // there is no equivalent in 3.0, let's return null so we can check if notifications are not empty in some 2.3 compatibility tests
+        null // there is no equivalent in 3.1, let's return null so we can check if notifications are not empty in some 2.3 compatibility tests
       case notification_2_3.BareNodeSyntaxDeprecatedNotification(position) =>
-        null // there is no equivalent in 3.0, let's return null so we can check if notifications are not empty in some 2.3 compatibility tests
+        null // there is no equivalent in 3.1, let's return null so we can check if notifications are not empty in some 2.3 compatibility tests
     }
 
     private def lift(position: frontend.v2_3.InputPosition): InputPosition = {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledConversionUtilsTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledConversionUtilsTest.scala
index 24ce73d5966e7..56308e1627180 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledConversionUtilsTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledConversionUtilsTest.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher.internal.codegen
 
 import org.mockito.Mockito.when
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.{Node, Relationship}
 
 class CompiledConversionUtilsTest extends CypherFunSuite {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledMathHelperTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledMathHelperTest.scala
index 4e1da727b9b23..6f6a624118f36 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledMathHelperTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledMathHelperTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.codegen
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
 import org.scalatest.prop.TableDrivenPropertyChecks
 import org.scalatest.{Assertions, Matchers, PropSpec}
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherCompilerPerformanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherCompilerPerformanceTest.scala
index ec9b77b3ca614..cb92932477b2a 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherCompilerPerformanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherCompilerPerformanceTest.scala
@@ -22,8 +22,8 @@ package org.neo4j.cypher.internal.compiler
 import org.neo4j.cypher.GraphDatabaseFunSuite
 import org.neo4j.cypher.internal.CypherCompiler.{CLOCK, DEFAULT_QUERY_PLAN_TTL, DEFAULT_STATISTICS_DIVERGENCE_THRESHOLD}
 import org.neo4j.cypher.internal.compatibility.WrappedMonitors3_0
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.compiler.v3_0.{CypherCompilerFactory, InfoLogger, _}
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.compiler.v3_1.{CypherCompilerFactory, InfoLogger, _}
 import org.neo4j.cypher.internal.spi.v3_0.GeneratedQueryStructure
 
 class CypherCompilerPerformanceTest extends GraphDatabaseFunSuite {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherPreParserTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherPreParserTest.scala
index 1387361a5c0f3..e59426e8a7a25 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherPreParserTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/CypherPreParserTest.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher.internal.compiler
 
 import org.neo4j.cypher.internal._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 import org.scalatest.prop.TableDrivenPropertyChecks
 
 class CypherPreParserTest extends CypherFunSuite with TableDrivenPropertyChecks {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/AllShortestPathsPipeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/AllShortestPathsPipeTest.scala
similarity index 84%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/AllShortestPathsPipeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/AllShortestPathsPipeTest.scala
index ec0c4b7a737b5..46618c7fbf073 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/AllShortestPathsPipeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/AllShortestPathsPipeTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.QueryStateHelper.queryStateFrom
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ShortestPath, SingleNode}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{FakePipe, PipeMonitor, ShortestPathPipe}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.QueryStateHelper.queryStateFrom
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ShortestPath, SingleNode}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{FakePipe, PipeMonitor, ShortestPathPipe}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, Path}
 
 import scala.collection.mutable
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CompilerComparisonTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CompilerComparisonTest.scala
similarity index 97%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CompilerComparisonTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CompilerComparisonTest.scala
index ea34b869c6d6d..3ff6f6670b692 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CompilerComparisonTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CompilerComparisonTest.scala
@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.io.{File, FileWriter}
 import java.text.NumberFormat
 import java.util.{Date, Locale}
 
 import org.neo4j.cypher.internal.compatibility.WrappedMonitors3_0
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planner._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.LogicalPlanRewriter
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planner._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.LogicalPlanRewriter
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.{GeneratedQueryStructure, TransactionBoundPlanContext, TransactionBoundQueryContext}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateNodeActionTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateNodeActionTest.scala
similarity index 90%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateNodeActionTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateNodeActionTest.scala
index aa3918ca44ea8..2f69f1ab98915 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateNodeActionTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateNodeActionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.CreateNode
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.CreateNode
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.api.security.AccessMode
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateRelationshipTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateRelationshipTest.scala
similarity index 92%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateRelationshipTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateRelationshipTest.scala
index 56dfa6e3fadba..ffc9b8f30d966 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CreateRelationshipTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CreateRelationshipTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.util
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{ParameterExpression, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateRelationship, RelationshipEndpoint}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{ParameterExpression, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateRelationship, RelationshipEndpoint}
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.api.security.AccessMode
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompilerAstCacheAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompilerAstCacheAcceptanceTest.scala
similarity index 95%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompilerAstCacheAcceptanceTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompilerAstCacheAcceptanceTest.scala
index 8a75dba6b7824..447a66b1f9d93 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/CypherCompilerAstCacheAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/CypherCompilerAstCacheAcceptanceTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.util.concurrent.TimeUnit
 
 import org.neo4j.cypher.GraphDatabaseTestSupport
 import org.neo4j.cypher.internal.compatibility.{StringInfoLogger3_0, WrappedMonitors3_0}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlan
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlan
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.spi.v3_0.GeneratedQueryStructure
 import org.neo4j.graphdb.config.Setting
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/DoubleCheckCreateUniqueTest.scala
similarity index 94%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/DoubleCheckCreateUniqueTest.scala
index 7cd00482bcc45..957e2d7fb733e 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/DoubleCheckCreateUniqueTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.lang.Iterable
 import java.util
 
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateUniqueAction, UniqueLink}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateUniqueAction, UniqueLink}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
 import org.neo4j.kernel.api.KernelTransaction
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelActionTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelActionTest.scala
similarity index 88%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelActionTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelActionTest.scala
index 6760f9297b686..ff6b5b3dd5f2a 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LabelActionTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LabelActionTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.{KeyToken, TokenType}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{LabelAction, LabelSetOp}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, _}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.{KeyToken, TokenType}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{LabelAction, LabelSetOp}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, _}
 
 import scala.collection.Iterator
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LazyTest.scala
similarity index 96%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LazyTest.scala
index 6c11c8c346b6d..0ece1bfc617b9 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/LazyTest.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.lang.{Iterable => JIterable}
 import java.util
@@ -29,14 +29,14 @@ import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
 import org.neo4j.collection.primitive.PrimitiveLongIterator
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Literal, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{GreaterThan, True}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{Counter, CountingIterator}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTInteger
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Literal, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{GreaterThan, True}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{Counter, CountingIterator}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.CTInteger
 import org.neo4j.cypher.internal.spi.v3_0.MonoDirectionalTraversalMatcher
 import org.neo4j.cypher.internal.{ExecutionEngine, ExecutionPlan, ExecutionResult}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MapPropertySetActionTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MapPropertySetActionTest.scala
similarity index 94%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MapPropertySetActionTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MapPropertySetActionTest.scala
index f395ca836ad17..5d00bde13b77d 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MapPropertySetActionTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MapPropertySetActionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.MapPropertySetAction
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.MapPropertySetAction
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
 import org.neo4j.graphdb.PropertyContainer
 
 class MapPropertySetActionTest extends GraphDatabaseFunSuite with QueryStateTestSupport {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MatchingContextTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MatchingContextTest.scala
similarity index 96%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MatchingContextTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MatchingContextTest.scala
index 77d023da0c5a3..66edd51484c3c 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MatchingContextTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MatchingContextTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal, Property}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.{Equals, Predicate}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.PropertyKey
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.PatternGraphBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.MatchingContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal, Property}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.{Equals, Predicate}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.PropertyKey
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.PatternGraphBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.MatchingContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.collection.Map
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MutationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MutationTest.scala
similarity index 92%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MutationTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MutationTest.scala
index 61503223a6ebb..cfdf675f13f6a 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/MutationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/MutationTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Expression, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, CreateRelationship, DeleteEntityAction, RelationshipEndpoint}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ExecuteUpdateCommandsPipe, PipeMonitor, QueryState, SingleRowPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Expression, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, CreateRelationship, DeleteEntityAction, RelationshipEndpoint}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ExecuteUpdateCommandsPipe, PipeMonitor, QueryState, SingleRowPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Node, NotFoundException}
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.api.security.AccessMode
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PathExpressionTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PathExpressionTest.scala
similarity index 85%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PathExpressionTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PathExpressionTest.scala
index 9a6d60861adb1..c53b84abe3547 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PathExpressionTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PathExpressionTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.ShortestPathExpression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.NonEmpty
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedLabel
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.AllReadEffects
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.ShortestPathExpression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.NonEmpty
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedLabel
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.AllReadEffects
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.{Direction, Path}
 
 class PathExpressionTest extends GraphDatabaseFunSuite with QueryStateTestSupport {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternMatchingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternMatchingTest.scala
similarity index 85%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternMatchingTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternMatchingTest.scala
index 9ce37fed4d78b..cd05449ca1980 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternMatchingTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternMatchingTest.scala
@@ -17,18 +17,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.RelatedTo
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.HasLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedLabel
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.PatternGraphBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternMatchingBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.RelatedTo
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.HasLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedLabel
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.PatternGraphBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternMatchingBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class PatternMatchingTest extends ExecutionEngineFunSuite with PatternGraphBuilder with QueryStateTestSupport {
   val symbols = new SymbolTable(Map("a" -> CTNode))
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternNodeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternNodeTest.scala
similarity index 89%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternNodeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternNodeTest.scala
index ac47444387f9c..150d203c60090 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PatternNodeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PatternNodeTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{MatchingPair, PatternNode}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{MatchingPair, PatternNode}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class PatternNodeTest extends GraphDatabaseFunSuite {
   test("returns pattern relationships") {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeLazynessTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeLazynessTest.scala
similarity index 91%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeLazynessTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeLazynessTest.scala
index 5fc6b74bf99f3..9b9bbbb2d640e 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/PipeLazynessTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/PipeLazynessTest.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Variable, Literal}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Variable, Literal}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb._
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateHelper.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateHelper.scala
similarity index 93%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateHelper.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateHelper.scala
index 5ad7cddca2067..86a88c3370037 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateHelper.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateHelper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ExternalCSVResource, NullPipeDecorator, PipeDecorator, QueryState}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, UpdateCountingQueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ExternalCSVResource, NullPipeDecorator, PipeDecorator, QueryState}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, UpdateCountingQueryContext}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateTestSupport.scala
similarity index 93%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateTestSupport.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateTestSupport.scala
index 45484bd150586..d5893120c9007 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/QueryStateTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/QueryStateTestSupport.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.QueryState
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.api.security.AccessMode
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RuleExecutablePlanBuilderTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RuleExecutablePlanBuilderTest.scala
similarity index 91%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RuleExecutablePlanBuilderTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RuleExecutablePlanBuilderTest.scala
index af01548ad81c4..1e3c81a1c37e9 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/RuleExecutablePlanBuilderTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/RuleExecutablePlanBuilderTest.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import java.util.concurrent._
 
@@ -25,23 +25,23 @@ import org.junit.Assert._
 import org.mockito.Mockito._
 import org.neo4j.cypher.GraphDatabaseTestSupport
 import org.neo4j.cypher.internal.compatibility.WrappedMonitors3_0
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{Literal, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.HasLabel
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.TokenType.{Label, PropertyKey}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.{ReturnItem, _}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, _}
-import org.neo4j.cypher.internal.compiler.v3_0.mutation.{CreateNode, DeletePropertyAction}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
-import org.neo4j.cypher.internal.compiler.v3_0.planner.CostBasedPipeBuilderFactory
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.rewriter.LogicalPlanRewriter
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{DefaultQueryPlanner, SimpleMetricsFactory}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.PlanContext
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.compiler.v3_0.tracing.rewriters.RewriterStepSequencer
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Statement
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{InternalException, Rewriter, Scope, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{Literal, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.HasLabel
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.TokenType.{Label, PropertyKey}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.{ReturnItem, _}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, _}
+import org.neo4j.cypher.internal.compiler.v3_1.mutation.{CreateNode, DeletePropertyAction}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
+import org.neo4j.cypher.internal.compiler.v3_1.planner.CostBasedPipeBuilderFactory
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.rewriter.LogicalPlanRewriter
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{DefaultQueryPlanner, SimpleMetricsFactory}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.PlanContext
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.compiler.v3_1.tracing.rewriters.RewriterStepSequencer
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Statement
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{InternalException, Rewriter, Scope, SemanticTable}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.{GeneratedQueryStructure, TransactionBoundQueryContext}
 import org.neo4j.graphdb.Label.label
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScalaPatternMatchingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScalaPatternMatchingTest.scala
similarity index 94%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScalaPatternMatchingTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScalaPatternMatchingTest.scala
index e10d55e7d13c7..cf8941761e652 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/ScalaPatternMatchingTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/ScalaPatternMatchingTest.scala
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.RelatedTo
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.PatternGraphBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternMatchingBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.RelatedTo
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.PatternGraphBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternMatchingBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ScalaPatternMatchingTest extends ExecutionEngineFunSuite with PatternGraphBuilder with QueryStateTestSupport {
   val symbols = new SymbolTable(Map("a" -> CTNode))
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticIndexAcceptanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticIndexAcceptanceTest.scala
similarity index 98%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticIndexAcceptanceTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticIndexAcceptanceTest.scala
index 1dd121146257b..55a14c31a7a76 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SemanticIndexAcceptanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SemanticIndexAcceptanceTest.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
 import org.scalacheck.Gen
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SimplePatternMatchingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SimplePatternMatchingTest.scala
similarity index 89%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SimplePatternMatchingTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SimplePatternMatchingTest.scala
index d4a18c5ee7e68..a028366983611 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SimplePatternMatchingTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SimplePatternMatchingTest.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.RelatedTo
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.PatternGraphBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.SimplePatternMatcherBuilder
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.RelatedTo
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.PatternGraphBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.SimplePatternMatcherBuilder
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class SimplePatternMatchingTest extends ExecutionEngineFunSuite with PatternGraphBuilder with QueryStateTestSupport {
   val symbols = new SymbolTable(Map("a" -> CTNode))
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SingleShortestPathPipeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SingleShortestPathPipeTest.scala
similarity index 87%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SingleShortestPathPipeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SingleShortestPathPipeTest.scala
index 482da7686c8b5..c973e61b4353f 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/SingleShortestPathPipeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/SingleShortestPathPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{FakePipe, PipeMonitor, ShortestPathPipe}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{FakePipe, PipeMonitor, ShortestPathPipe}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.neo4j.graphdb.{Direction, Node, Path}
 
 class SingleShortestPathPipeTest extends GraphDatabaseFunSuite {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TrailDecomposeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TrailDecomposeTest.scala
similarity index 97%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TrailDecomposeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TrailDecomposeTest.scala
index 4e324f0a34590..fe66670df738a 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TrailDecomposeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TrailDecomposeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{EndPoint, SingleStepTrail, VariableLengthStepTrail}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{EndPoint, SingleStepTrail, VariableLengthStepTrail}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 
 class TrailDecomposeTest extends GraphDatabaseFunSuite {
   test("decompose_simple_path") {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherBuilderTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherBuilderTest.scala
similarity index 89%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherBuilderTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherBuilderTest.scala
index ee40916b2f266..83b46f0ccc8c3 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherBuilderTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherBuilderTest.scala
@@ -17,24 +17,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.StatementConverters._
-import org.neo4j.cypher.internal.compiler.v3_0.commands._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.builders.{BuilderTest, Solved, TraversalMatcherBuilder, Unsolved}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.{ArgumentPipe, SingleRowPipe}
-import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import org.neo4j.cypher.internal.frontend.v3_0.parser.CypherParser
+import org.neo4j.cypher.internal.compiler.v3_1.ast.convert.commands.StatementConverters._
+import org.neo4j.cypher.internal.compiler.v3_1.commands._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.builders.{BuilderTest, Solved, TraversalMatcherBuilder, Unsolved}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.{ArgumentPipe, SingleRowPipe}
+import org.neo4j.cypher.internal.compiler.v3_1.symbols.SymbolTable
+import org.neo4j.cypher.internal.frontend.v3_1.parser.CypherParser
 import org.neo4j.kernel.impl.coreapi.InternalTransaction
 import org.neo4j.kernel.api.KernelTransaction
 import org.neo4j.kernel.api.security.AccessMode
 
 class TraversalMatcherBuilderTest extends GraphDatabaseFunSuite with BuilderTest {
 
-  import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+  import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
   var builder: TraversalMatcherBuilder = null
   var tx: InternalTransaction = null
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherTest.scala
similarity index 94%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherTest.scala
index 33ed4c2b68254..7dc6fcdbc8cd0 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TraversalMatcherTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TraversalMatcherTest.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.pipes._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.SingleStep
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Argument
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection.{BOTH, OUTGOING}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.pipes._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.SingleStep
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Argument
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, OUTGOING}
 import org.neo4j.cypher.internal.spi.v3_0.{BidirectionalTraversalMatcher, MonoDirectionalTraversalMatcher}
 import org.neo4j.graphdb.{Node, Path}
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TriadicIntegrationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TriadicIntegrationTest.scala
similarity index 99%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TriadicIntegrationTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TriadicIntegrationTest.scala
index e93d0a701330c..6e3e840aee362 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/TriadicIntegrationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/TriadicIntegrationTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.ExecutionEngineFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class TriadicIntegrationTest extends ExecutionEngineFunSuite {
   private val QUERY: String = """MATCH (p1:Person)-[:FRIEND]-()-[:FRIEND]-(p2:Person)
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/VariableLengthExpanderStepExpandTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/VariableLengthExpanderStepExpandTest.scala
similarity index 96%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/VariableLengthExpanderStepExpandTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/VariableLengthExpanderStepExpandTest.scala
index 17a6eb3c238c2..1d7cd77d80f91 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/VariableLengthExpanderStepExpandTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/VariableLengthExpanderStepExpandTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0
+package org.neo4j.cypher.internal.compiler.v3_1
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
-import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.True
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.{ExpanderStep, SingleStep, VarLengthStep}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1.commands.predicates.True
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.{ExpanderStep, SingleStep, VarLengthStep}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb.Direction
 
 class VariableLengthExpanderStepExpandTest extends GraphDatabaseFunSuite with QueryStateTestSupport {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGeneratorTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGeneratorTest.scala
similarity index 98%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGeneratorTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGeneratorTest.scala
index f1e34d83c0272..631d29501b93d 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/CodeGeneratorTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/CodeGeneratorTest.scala
@@ -17,23 +17,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen
+package org.neo4j.cypher.internal.compiler.v3_1.codegen
 
 import org.mockito.Matchers._
 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.compiler.v3_0.executionplan.ExecutionPlanBuilder.tracer
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.planner.LogicalPlanningTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{CostBasedPlannerName, NormalMode, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{ParameterNotFoundException, SemanticDirection, SemanticTable}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanBuilder.tracer
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.planner.LogicalPlanningTestSupport
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{InternalResultRow, InternalResultVisitor, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{CostBasedPlannerName, NormalMode, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{ParameterNotFoundException, SemanticDirection, SemanticTable}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.GeneratedQueryStructure
 import org.neo4j.graphdb.{Direction, Node, Relationship}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTableInstructionsTest.scala
similarity index 96%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTableInstructionsTest.scala
index c270141631f9d..1190a8bff8598 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/BuildProbeTableInstructionsTest.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -25,10 +25,10 @@ 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.compiler.v3_0.codegen.{CodeGenContext, JoinTableMethod, Variable}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, symbols}
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{CodeGenContext, JoinTableMethod, Variable}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticTable, symbols}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.graphdb.Node
 import org.neo4j.kernel.api.ReadOperations
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenExpressionCompilationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenExpressionCompilationTest.scala
similarity index 92%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenExpressionCompilationTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenExpressionCompilationTest.scala
index c9a199aea630d..c796f8e9e0718 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenExpressionCompilationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenExpressionCompilationTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.ir.expressions._
-import org.neo4j.cypher.internal.frontend.v3_0
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.ir.expressions._
+import org.neo4j.cypher.internal.frontend.v3_1
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.scalatest._
 
 class CodeGenExpressionCompilationTest extends CypherFunSuite with Matchers with CodeGenSugar {
@@ -83,10 +83,10 @@ class CodeGenExpressionCompilationTest extends CypherFunSuite with Matchers with
 
   val divOperation = Operation("Division", Division.apply, Seq(
     (0, 2, Left(0)),
-    (10, 0, Right(classOf[v3_0.ArithmeticException])),
+    (10, 0, Right(classOf[v3_1.ArithmeticException])),
     (-42, 42, Left(-1)),
     (1, 2, Left(0)),
-    (10.0, 0.0, Right(classOf[v3_0.ArithmeticException])),
+    (10.0, 0.0, Right(classOf[v3_1.ArithmeticException])),
     (-3.25, 13.0, Left(-0.25)),
     (0, 2.0, Left(0.0)),
     (-9, 3.0, Left(-3.0)),
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenSugar.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenSugar.scala
similarity index 91%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenSugar.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenSugar.scala
index 357a4edbd5b0a..fb66c18cc7d0e 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CodeGenSugar.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CodeGenSugar.scala
@@ -17,19 +17,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
 import java.util.concurrent.atomic.AtomicInteger
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.{Namer, _}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.ExecutionPlanBuilder.tracer
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan._
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.{Id, InternalPlanDescription}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.LogicalPlan
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{GraphStatistics, InternalResultRow, InternalResultVisitor, PlanContext, QueryContext}
-import org.neo4j.cypher.internal.compiler.v3_0.{CostBasedPlannerName, ExecutionMode, NormalMode, TaskCloser}
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticTable
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.{Namer, _}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.ExecutionPlanBuilder.tracer
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan._
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.{Id, InternalPlanDescription}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.LogicalPlan
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, InternalResultRow, InternalResultVisitor, PlanContext, QueryContext}
+import org.neo4j.cypher.internal.compiler.v3_1.{CostBasedPlannerName, ExecutionMode, NormalMode, TaskCloser}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticTable
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.spi.v3_0.{GeneratedQueryStructure, TransactionBoundQueryContext}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CompiledProfilingTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CompiledProfilingTest.scala
similarity index 83%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CompiledProfilingTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CompiledProfilingTest.scala
index f58effce5192a..deac936fe826d 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/CompiledProfilingTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/codegen/ir/CompiledProfilingTest.scala
@@ -17,24 +17,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.codegen.ir
+package org.neo4j.cypher.internal.compiler.v3_1.codegen.ir
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.neo4j.collection.primitive.PrimitiveLongIterator
-import org.neo4j.cypher.internal.compiler.v3_0.ProfileMode
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.Variable
-import org.neo4j.cypher.internal.compiler.v3_0.codegen.profiling.ProfilingTracer
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.Provider
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows}
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans._
-import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.{Cardinality, plans}
-import org.neo4j.cypher.internal.compiler.v3_0.planner.{CardinalityEstimation, PlannerQuery}
-import org.neo4j.cypher.internal.compiler.v3_0.spi.{QueryContext, QueryTransactionalContext}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.SignedDecimalIntegerLiteral
-import org.neo4j.cypher.internal.frontend.v3_0.symbols
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.ProfileMode
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.Variable
+import org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling.ProfilingTracer
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.Provider
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows}
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans._
+import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.{Cardinality, plans}
+import org.neo4j.cypher.internal.compiler.v3_1.planner.{CardinalityEstimation, PlannerQuery}
+import org.neo4j.cypher.internal.compiler.v3_1.spi.{QueryContext, QueryTransactionalContext}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.SignedDecimalIntegerLiteral
+import org.neo4j.cypher.internal.frontend.v3_1.symbols
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.kernel.api._
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMapTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMapTest.scala
similarity index 86%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMapTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMapTest.scala
index 34496b414a6b8..01d29adaee946 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/LiteralMapTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/commands/expressions/LiteralMapTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
+package org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
 
-import org.neo4j.cypher.internal.compiler.v3_0.commands.values.UnresolvedProperty
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.commands.values.UnresolvedProperty
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class LiteralMapTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ActualCostCalculationTest.scala
similarity index 97%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ActualCostCalculationTest.scala
index f4a491a067118..e4e3ff0aa811b 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/ActualCostCalculationTest.scala
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import java.io.File
 import java.nio.file.Files
 import java.util.concurrent.TimeUnit
 
 import org.apache.commons.math3.stat.regression.{OLSMultipleLinearRegression, SimpleRegression}
-import org.neo4j.cypher.internal.compiler.v3_0.commands.SingleQueryExpression
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.Literal
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{LabelId, PropertyKeyId, SemanticDirection, ast}
+import org.neo4j.cypher.internal.compiler.v3_1.commands.SingleQueryExpression
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.Literal
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, PropertyKeyId, SemanticDirection, ast}
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.spi.v3_0.{TransactionBoundPlanContext, TransactionBoundQueryContext}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipeTest.scala
similarity index 82%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipeTest.scala
index f51a9bbef471e..d353cccb41212 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/MatchPipeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/MatchPipeTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternGraph
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.matching.PatternGraph
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class MatchPipeTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipeTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipeTest.scala
similarity index 94%
rename from community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipeTest.scala
rename to community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipeTest.scala
index 461208d21a070..190ff32bf8f38 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/NamedPathPipeTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_1/pipes/NamedPathPipeTest.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_0.pipes
+package org.neo4j.cypher.internal.compiler.v3_1.pipes
 
 import org.neo4j.cypher.GraphDatabaseFunSuite
 import org.neo4j.cypher.internal._
-import org.neo4j.cypher.internal.compiler.v3_0._
-import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
+import org.neo4j.cypher.internal.compiler.v3_1._
+import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
 import org.neo4j.graphdb._
 
 class NamedPathPipeTest extends GraphDatabaseFunSuite {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/CastSupportTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/CastSupportTest.scala
index 9b96caf43174c..ae34b7f6bcdee 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/CastSupportTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/CastSupportTest.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.internal.helpers
 
-import org.neo4j.cypher.internal.compiler.v3_0.helpers
-import org.neo4j.cypher.internal.frontend.v3_0.CypherTypeException
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.helpers
+import org.neo4j.cypher.internal.frontend.v3_1.CypherTypeException
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CastSupportTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/JavaConversionSupportTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/JavaConversionSupportTest.scala
index 28b955c767ef2..fcda198a89856 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/JavaConversionSupportTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/JavaConversionSupportTest.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher.internal.helpers
 
 import org.neo4j.collection.primitive.PrimitiveLongCollections
-import org.neo4j.cypher.internal.compiler.v3_0.helpers
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.helpers
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class JavaConversionSupportTest extends CypherFunSuite {
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
index cbbb9c774bc00..766adf2ef47f8 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
@@ -22,9 +22,9 @@ package org.neo4j.cypher.internal.spi.v3_0
 import java.net.URL
 
 import org.mockito.Mockito._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.DynamicIterable
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.DynamicIterable
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/tracing/TimingCompilationTracerTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/tracing/TimingCompilationTracerTest.scala
index cf01acba6277a..01902866ab8a2 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/tracing/TimingCompilationTracerTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/tracing/TimingCompilationTracerTest.scala
@@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeUnit.MILLISECONDS
 
 import org.mockito.Mockito.verify
-import org.neo4j.cypher.internal.compiler.v3_0.CompilationPhaseTracer.CompilationPhase.{LOGICAL_PLANNING, PARSING}
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.{closing, using}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.CompilationPhaseTracer.CompilationPhase.{LOGICAL_PLANNING, PARSING}
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.{closing, using}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.tracing.CompilationTracer.NO_COMPILATION_TRACING
 import org.neo4j.cypher.internal.tracing.TimingCompilationTracer.QueryEvent
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala
index b5d884a645e29..c0018faf72824 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.performance
 
 import java.io.File
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.RelationshipType
 import org.neo4j.index.impl.lucene.legacy.LuceneBatchInserterIndexProviderNewImpl
 import org.neo4j.unsafe.batchinsert.{BatchInserter, BatchInserterIndex, BatchInserters}
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
index 31374c7b42cbb..ce5687545053d 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.performance
 
 import java.util.Collections
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.factory.GraphDatabaseFactory
 import org.neo4j.graphdb.{GraphDatabaseService, Node, RelationshipType}
 
diff --git a/community/cypher/frontend-3.0/LICENSES.txt b/community/cypher/frontend-3.1/LICENSES.txt
similarity index 100%
rename from community/cypher/frontend-3.0/LICENSES.txt
rename to community/cypher/frontend-3.1/LICENSES.txt
diff --git a/community/cypher/frontend-3.0/NOTICE.txt b/community/cypher/frontend-3.1/NOTICE.txt
similarity index 100%
rename from community/cypher/frontend-3.0/NOTICE.txt
rename to community/cypher/frontend-3.1/NOTICE.txt
diff --git a/community/cypher/frontend-3.0/pom.xml b/community/cypher/frontend-3.1/pom.xml
similarity index 98%
rename from community/cypher/frontend-3.0/pom.xml
rename to community/cypher/frontend-3.1/pom.xml
index 30bca28d0af7b..80729d5b1fbff 100644
--- a/community/cypher/frontend-3.0/pom.xml
+++ b/community/cypher/frontend-3.1/pom.xml
@@ -8,10 +8,10 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+  <artifactId>neo4j-cypher-frontend-3.1</artifactId>
   <packaging>jar</packaging>
   <version>3.1.0-SNAPSHOT</version>
-  <name>Neo4j - Cypher Frontend 3.0</name>
+  <name>Neo4j - Cypher Frontend 3.1</name>
 
   <description>Front end of the Cypher compiler</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Bound.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Bound.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Bound.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Bound.scala
index 41162a8613200..114e45841171c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Bound.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Bound.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 sealed trait Bound[+V] {
   def endPoint: V
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/CypherException.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/CypherException.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/CypherException.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/CypherException.scala
index 540305399b140..7665ab00e272e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/CypherException.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/CypherException.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.ExhaustiveShortestPathForbiddenException.ERROR_MSG
-import org.neo4j.cypher.internal.frontend.v3_0.spi.MapToPublicExceptions
+import org.neo4j.cypher.internal.frontend.v3_1.ExhaustiveShortestPathForbiddenException.ERROR_MSG
+import org.neo4j.cypher.internal.frontend.v3_1.spi.MapToPublicExceptions
 
 abstract class CypherException(protected val message: String, cause: Throwable) extends RuntimeException(message, cause) {
   def this() = this(null, null)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Foldable.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Foldable.scala
similarity index 99%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Foldable.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Foldable.scala
index cada941245715..b89d85ccd292e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Foldable.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Foldable.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 import scala.annotation.tailrec
 import scala.collection.mutable
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/IdentityMap.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/IdentityMap.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/IdentityMap.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/IdentityMap.scala
index c4b3383a1928f..f71b834386bca 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/IdentityMap.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/IdentityMap.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 import java.util
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/InputPosition.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/InputPosition.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/InputPosition.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/InputPosition.scala
index b7eef834609ea..9cfd19bb0fb41 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/InputPosition.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/InputPosition.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 case class InputPosition(offset: Int, line: Int, column: Int) {
   self =>
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/NameId.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/NameId.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/NameId.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/NameId.scala
index 0866824fefc52..21517e8db50fb 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/NameId.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/NameId.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 sealed trait NameId {
   def id: Int
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Ref.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Ref.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Ref.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Ref.scala
index 881119094ab12..3259b3ccff989 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Ref.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Ref.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 object Ref {
   def apply[T <: AnyRef](v: T) = new Ref[T](v)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Rewritable.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Rewritable.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Rewritable.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Rewritable.scala
index 59f4b068eb597..0cc6c833f204d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/Rewritable.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/Rewritable.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 import java.lang.reflect.Method
 
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
 
 import scala.annotation.tailrec
 import scala.collection.mutable
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticCheck.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticCheck.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticCheck.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticCheck.scala
index ab04793d9dbd0..70cade9fcdb7c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticCheck.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticCheck.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ScopeExpression, Expression, ASTNode}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ScopeExpression, Expression, ASTNode}
 
 object SemanticCheckResult {
   val success: SemanticCheck = SemanticCheckResult(_, Vector())
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticDirection.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticDirection.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticDirection.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticDirection.scala
index fe8e17c70ff7d..1d29278cfa139 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticDirection.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticDirection.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 sealed trait SemanticDirection {
   def reversed: SemanticDirection
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticError.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticError.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticError.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticError.scala
index 7b8047f30fb84..9f0b42b3843ea 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticError.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticError.scala
@@ -17,6 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 case class SemanticError(msg: String, position: InputPosition, references: InputPosition*)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticState.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticState.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticState.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticState.scala
index 5b23a15436b7c..1b13bc5d73f5e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticState.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticState.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticState.ScopeLocation
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ASTAnnotationMap, Variable}
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.{TreeElem, TreeZipper}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.InternalNotification
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticState.ScopeLocation
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ASTAnnotationMap, Variable}
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.{TreeElem, TreeZipper}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.InternalNotification
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
 
 import scala.collection.immutable.HashMap
 import scala.language.postfixOps
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticTable.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticTable.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticTable.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticTable.scala
index 4b2a774116efe..96266a99cb72b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/SemanticTable.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/SemanticTable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Variable, ASTNode, Expression, ASTAnnotationMap}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Variable, ASTNode, Expression, ASTAnnotationMap}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
 
 import scala.collection.mutable
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTAnnotationMap.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTAnnotationMap.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTAnnotationMap.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTAnnotationMap.scala
index 275185d4ced46..2b2da4d00cb9a 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTAnnotationMap.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTAnnotationMap.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 
 object ASTAnnotationMap {
   def empty[K <: ASTNode, V]: ASTAnnotationMap[K, V] = new ASTAnnotationMap(Map.empty[(K, InputPosition), V])
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNode.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNode.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNode.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNode.scala
index 4baeae2ed49c1..c46b8eb2956d5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNode.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNode.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 trait ASTNode
   extends Product
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndedPropertyInequalities.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndedPropertyInequalities.scala
similarity index 82%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndedPropertyInequalities.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndedPropertyInequalities.scala
index 53bbd9ef9146a..b679f3508751b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndedPropertyInequalities.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndedPropertyInequalities.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheck
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheck
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
 
 case class AndedPropertyInequalities(variable: Variable, property: Property, inequalities: NonEmptyList[InequalityExpression]) extends Expression {
   def position = variable.position
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ArithmeticFunctions.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ArithmeticFunctions.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ArithmeticFunctions.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ArithmeticFunctions.scala
index ed75afd560705..5b2fd62d357de 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ArithmeticFunctions.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ArithmeticFunctions.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 import Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticError, SemanticCheck, SemanticCheckResult, ast, TypeGenerator, InputPosition}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, TypeSpec, _}
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticError, SemanticCheck, SemanticCheckResult, ast, TypeGenerator, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, TypeSpec, _}
 
 import scala.util.Try
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpression.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpression.scala
index 02845d2180c88..c74384643e4fa 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpression.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheck}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheck}
 
 case class CaseExpression(expression: Option[Expression], alternatives: Seq[(Expression, Expression)], default: Option[Expression])(val position: InputPosition) extends Expression {
   lazy val possibleExpressions = alternatives.map(_._2) ++ default
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Clause.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Clause.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Clause.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Clause.scala
index 0a7c07f7e1c7f..b7ca9b602d06a 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Clause.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Clause.scala
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
-
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheckResult._
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
-import org.neo4j.cypher.internal.frontend.v3_0.notification.CartesianProductNotification
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+package org.neo4j.cypher.internal.frontend.v3_1.ast
+
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheckResult._
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
+import org.neo4j.cypher.internal.frontend.v3_1.notification.CartesianProductNotification
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 sealed trait Clause extends ASTNode with ASTPhrase with SemanticCheckable {
   def name: String
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CoerceTo.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CoerceTo.scala
similarity index 81%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CoerceTo.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CoerceTo.scala
index fbc9622a3c779..c0afa0bedc251 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CoerceTo.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CoerceTo.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheck
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{TypeSpec, CypherType}
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheck
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{TypeSpec, CypherType}
 
 case class CoerceTo(expr: Expression, typ: CypherType) extends Expression {
   def position = expr.position
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Collection.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Collection.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Collection.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Collection.scala
index cb09877b5acd7..8278a72117bf5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Collection.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Collection.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheckResult, InputPosition, SemanticError, TypeGenerator}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheckResult, InputPosition, SemanticError, TypeGenerator}
 
 case class Collection(expressions: Seq[Expression])(val position: InputPosition) extends Expression {
   def semanticCheck(ctx: SemanticContext) = expressions.semanticCheck(ctx) chain specifyType(possibleTypes)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Command.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Command.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Command.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Command.scala
index d4ac4046dd5ef..82156d5a94524 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Command.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Command.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, _}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, _}
 
 sealed trait Command extends Statement {
   override def returnColumns = List.empty
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpression.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpression.scala
index 101d06e6e7ce4..45fc48edd6cec 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpression.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 object ConstantExpression {
   def unapply(v: AnyRef): Option[Expression] = v match {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CountStar.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CountStar.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CountStar.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CountStar.scala
index 2caecd9cff83f..d6cef506d1f10 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CountStar.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CountStar.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class CountStar()(val position: InputPosition) extends Expression with SimpleTyping {
   protected def possibleTypes = CTInteger
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Expression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Expression.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Expression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Expression.scala
index f1fe6ab7ed794..a3545d9c75745 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Expression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Expression.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.Foldable._
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheckResult._
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, TypeSpec, _}
+import org.neo4j.cypher.internal.frontend.v3_1.Foldable._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheckResult._
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, TypeSpec, _}
 
 import scala.collection.immutable.Stack
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Function.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Function.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Function.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Function.scala
index bf01af1ae6aa1..cec65bbf12eb6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Function.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Function.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CypherType, TypeSpec}
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CypherType, TypeSpec}
 
 object Function {
   private val knownFunctions: Seq[Function] = Vector(
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionInvocation.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionInvocation.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionInvocation.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionInvocation.scala
index 2025e4c558f6f..c4fe9b967995c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionInvocation.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionInvocation.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticError, _}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticError, _}
 
 object FunctionInvocation {
   def apply(name: FunctionName, argument: Expression)(position: InputPosition): FunctionInvocation =
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GetDegree.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GetDegree.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GetDegree.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GetDegree.scala
index 474f25878c1b1..2807c3ff4f81f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GetDegree.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GetDegree.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, InputPosition}
 
 case class GetDegree(node: Expression, relType: Option[RelTypeName], dir: SemanticDirection)(val position: InputPosition)
   extends Expression with SimpleTyping {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HasLabels.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HasLabels.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HasLabels.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HasLabels.scala
index 901933192c540..e4f4e5d7df6d5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HasLabels.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HasLabels.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 case class HasLabels(expression: Expression, labels: Seq[LabelName])(val position: InputPosition)
   extends Expression with SimpleTyping {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Hint.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Hint.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Hint.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Hint.scala
index 412f1a6e60cc0..a45ae39bda022 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Hint.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Hint.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, InternalException, SemanticCheckable}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, InternalException, SemanticCheckable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 sealed trait Hint extends ASTNode with ASTPhrase with SemanticCheckable {
   def variables: NonEmptyList[Variable]
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregate.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregate.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregate.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregate.scala
index 5917c5f86fe88..b3735aabb77b0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregate.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregate.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 
 object IsAggregate {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IterableExpressions.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IterableExpressions.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IterableExpressions.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IterableExpressions.scala
index 686b5e4a29f4e..83cc0e2fd9d30 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IterableExpressions.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IterableExpressions.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 trait FilteringExpression extends Expression {
   def name: String
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Limit.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Limit.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Limit.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Limit.scala
index f247c11cf7edc..8740f1138cbf6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Limit.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Limit.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 case class Limit(expression: Expression)(val position: InputPosition) extends ASTNode with ASTSlicingPhrase {
   override def name = "LIMIT" // ASTSlicingPhrase name
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Literal.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Literal.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Literal.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Literal.scala
index 9f48b15afb16e..9682eb92100a6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Literal.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Literal.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 sealed trait Literal extends Expression {
   def value: AnyRef
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MapExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MapExpression.scala
similarity index 82%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MapExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MapExpression.scala
index 469a05555e18e..6794309183fc5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MapExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MapExpression.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class MapExpression(items: Seq[(PropertyKeyName, Expression)])(val position: InputPosition) extends Expression with SimpleTyping {
   protected def possibleTypes = CTMap
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MergeAction.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MergeAction.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MergeAction.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MergeAction.scala
index 42f8f45202a96..f76311a979170 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MergeAction.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MergeAction.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheck, SemanticCheckable, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheck, SemanticCheckable, InputPosition}
 
 sealed trait MergeAction extends ASTNode with ASTPhrase with SemanticCheckable
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/NameToken.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/NameToken.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/NameToken.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/NameToken.scala
index ab6e66f2a040e..b5a58868c8dfa 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/NameToken.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/NameToken.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{PropertyKeyId, LabelId, NameId}
+import org.neo4j.cypher.internal.frontend.v3_1.{PropertyKeyId, LabelId, NameId}
 
 sealed abstract class NameToken[I <: NameId] {
   def name: String
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OperatorExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OperatorExpression.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OperatorExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OperatorExpression.scala
index a01c5094ff6a6..56cfd13537493 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OperatorExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OperatorExpression.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 trait OperatorExpression {
   self: Expression =>
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Order.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Order.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Order.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Order.scala
index f21e6c0dea58e..59e62027ad1ae 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Order.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Order.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheckable}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheckable}
 
 case class OrderBy(sortItems: Seq[SortItem])(val position: InputPosition) extends ASTNode with ASTPhrase with SemanticCheckable {
   def semanticCheck = sortItems.semanticCheck
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Parameter.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Parameter.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Parameter.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Parameter.scala
index 798081e844e72..14fea5a7f405d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Parameter.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Parameter.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Parameter(name: String,
                      parameterType: CypherType)(val position: InputPosition)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PathExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PathExpression.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PathExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PathExpression.scala
index 0456d35a692c4..49ef2f4400109 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PathExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PathExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.{CTPath, TypeSpec}
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticDirection}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.{CTPath, TypeSpec}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticDirection}
 
 sealed trait PathStep {
   def dependencies: Set[Variable]
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Pattern.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Pattern.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Pattern.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Pattern.scala
index 132a1accac83e..ea7c48a52d3c5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Pattern.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Pattern.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.notification.UnboundedShortestPathNotification
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.notification.UnboundedShortestPathNotification
 
 object Pattern {
   sealed trait SemanticContext
@@ -63,7 +63,7 @@ object Pattern {
   }
 }
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Pattern._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Pattern._
 
 case class Pattern(patternParts: Seq[PatternPart])(val position: InputPosition) extends ASTNode with ASTParticle {
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PatternExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PatternExpression.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PatternExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PatternExpression.scala
index cbe41aca6c20e..7b9cfc153d352 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PatternExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PatternExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class PatternExpression(pattern: RelationshipsPattern) extends Expression with SimpleTyping {
   def position = pattern.position
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHint.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHint.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHint.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHint.scala
index 799cbdbf8f187..8cf6aee502811 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHint.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHint.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 case class PeriodicCommitHint(size: Option[IntegerLiteral])(val position: InputPosition) extends ASTNode with ASTPhrase with SemanticCheckable {
   def name = s"USING PERIODIC COMMIT $size"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PredicateExpressions.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PredicateExpressions.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PredicateExpressions.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PredicateExpressions.scala
index cc2d443c91408..b1f04a946a4af 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PredicateExpressions.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PredicateExpressions.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheck, SemanticCheckResult, SemanticState, _}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheck, SemanticCheckResult, SemanticState, _}
 
 case class And(lhs: Expression, rhs: Expression)(val position: InputPosition) extends Expression with BinaryOperatorExpression with InfixFunctionTyping {
   val signatures = Vector(
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProcedureResultItem.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProcedureResultItem.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProcedureResultItem.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProcedureResultItem.scala
index b77ffa3156222..2bd19f080eb1d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProcedureResultItem.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProcedureResultItem.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheckResult.error
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheckResult.error
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 object ProcedureResultItem {
   def apply(output: ProcedureOutput, variable: Variable)(position: InputPosition): ProcedureResultItem =
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Property.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Property.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Property.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Property.scala
index a336944a9fb4e..4bddc64c945d1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Property.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Property.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, InternalException, SemanticCheck, SemanticError}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, InternalException, SemanticCheck, SemanticError}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Property(map: Expression, propertyKey: PropertyKeyName)(val position: InputPosition) extends Expression with SimpleTyping {
   protected def possibleTypes = CTAny.covariant
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Query.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Query.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Query.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Query.scala
index fbb62825321f4..631f75cd8aee2 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Query.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Query.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticChecking, SemanticError, _}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticChecking, SemanticError, _}
 
 case class Query(periodicCommitHint: Option[PeriodicCommitHint], part: QueryPart)(val position: InputPosition)
   extends Statement with SemanticChecking {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Range.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Range.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Range.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Range.scala
index 7ab69e0679129..8be095cee078e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Range.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Range.scala
@@ -17,8 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 case class Range(lower: Option[UnsignedIntegerLiteral], upper: Option[UnsignedIntegerLiteral])(val position: InputPosition) extends ASTNode with ASTParticle
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/RemoveItem.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/RemoveItem.scala
similarity index 88%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/RemoveItem.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/RemoveItem.scala
index ad3f34f3ba115..f7584df927c85 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/RemoveItem.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/RemoveItem.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheckable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheckable}
 
 sealed trait RemoveItem extends ASTNode with ASTPhrase with SemanticCheckable
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItem.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItem.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItem.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItem.scala
index 6995c5a884d0c..8f825df33f80c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItem.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItem.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 case class ReturnItems(includeExisting: Boolean, items: Seq[ReturnItem])(val position: InputPosition) extends ASTNode with ASTPhrase with SemanticCheckable with SemanticChecking {
   def semanticCheck =
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ScopeExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ScopeExpression.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ScopeExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ScopeExpression.scala
index b160ee2314689..a1ced7741b5ef 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ScopeExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ScopeExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheckResult}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheckResult}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
 
 // Scope expressions bundle together variables of a new scope
 // together with any child expressions that get evaluated in a context where
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetItem.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetItem.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetItem.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetItem.scala
index 7e7ef5e983c92..f67bda5ff4d7e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetItem.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetItem.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheckable}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheckable}
 
 sealed trait SetItem extends ASTNode with ASTPhrase with SemanticCheckable
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ShortestPathExpression.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ShortestPathExpression.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ShortestPathExpression.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ShortestPathExpression.scala
index 19a8afbb85c1f..ff75c2b923089 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ShortestPathExpression.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ShortestPathExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 import Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class ShortestPathExpression(pattern: ShortestPaths) extends Expression with SimpleTyping {
   def position = pattern.position
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Skip.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Skip.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Skip.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Skip.scala
index 7e191987201df..6a7fd3b628d42 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Skip.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Skip.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 case class Skip(expression: Expression)(val position: InputPosition) extends ASTNode with ASTSlicingPhrase {
   override def name = "SKIP" // ASTSlicingPhrase name
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Statement.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Statement.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Statement.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Statement.scala
index 48b3700f3b0d8..bdd5585ee3224 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Statement.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Statement.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticCheck
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticCheck
 
 trait Statement extends ASTNode with ASTPhrase {
   def semanticCheck: SemanticCheck
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SymbolicName.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SymbolicName.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SymbolicName.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SymbolicName.scala
index c6e53ac10db0e..68384cf9c5437 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SymbolicName.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SymbolicName.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1._
 
 trait SymbolicName extends ASTNode with ASTParticle {
   def name: String
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Variable.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Variable.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Variable.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Variable.scala
index 180455ceae958..9995d90000200 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Variable.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Variable.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SemanticCheckResult, SemanticState, SymbolUse}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SemanticCheckResult, SemanticState, SymbolUse}
 
 case class Variable(name: String)(val position: InputPosition) extends Expression {
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Where.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Where.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Where.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Where.scala
index 604862e1bd5a2..247e51f8d6c97 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/Where.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/Where.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheckable, InputPosition}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheckable, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case class Where(expression: Expression)(val position: InputPosition)
   extends ASTNode with ASTPhrase with SemanticCheckable {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/connectedComponents.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/connectedComponents.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/connectedComponents.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/connectedComponents.scala
index 35c9fee0a1884..82864c505fc25 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/connectedComponents.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/connectedComponents.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 import scala.annotation.tailrec
 import scala.collection.immutable
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/containsAggregate.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/containsAggregate.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/containsAggregate.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/containsAggregate.scala
index 10550b39911c6..f0bd0fd55aace 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/containsAggregate.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/containsAggregate.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 object containsAggregate extends (Expression => Boolean) {
   def apply(expr: Expression) = {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Abs.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Abs.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Abs.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Abs.scala
index 1c987bd48089a..31f00da588b5f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Abs.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Abs.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Abs extends Function with SimpleTypedFunction {
   def name = "abs"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Acos.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Acos.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Acos.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Acos.scala
index 01e1d0235e39f..b5f5bb924cb6a 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Acos.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Acos.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Acos extends Function with SimpleTypedFunction {
   def name = "acos"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Asin.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Asin.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Asin.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Asin.scala
index eb81733f92148..a6d449c56b5d6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Asin.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Asin.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Asin extends Function with SimpleTypedFunction {
   def name = "asin"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan.scala
index cb1f0c82edfb8..8a2caeaecd361 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Atan extends Function with SimpleTypedFunction {
   def name = "atan"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan2.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan2.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan2.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan2.scala
index d05afcd074275..5f3f61548c556 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Atan2.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Atan2.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Atan2 extends Function with SimpleTypedFunction {
   def name = "atan2"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Avg.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Avg.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Avg.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Avg.scala
index c02017eae4521..7ad51b38b7354 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Avg.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Avg.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Avg extends AggregatingFunction with SimpleTypedFunction {
   def name = "avg"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Ceil.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Ceil.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Ceil.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Ceil.scala
index ad337a62a958a..a9433ebe2acc7 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Ceil.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Ceil.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Ceil extends Function with SimpleTypedFunction {
   def name = "ceil"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Coalesce.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Coalesce.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Coalesce.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Coalesce.scala
index d674cb1885346..1393ebf8d67ce 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Coalesce.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Coalesce.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Function
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Function
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Coalesce extends Function {
   def name = "coalesce"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Collect.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Collect.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Collect.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Collect.scala
index 34fbad6eb4607..f59d0e2b443bc 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Collect.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Collect.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.AggregatingFunction
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.AggregatingFunction
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Collect extends AggregatingFunction  {
   def name = "collect"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cos.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cos.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cos.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cos.scala
index 06aa0fd5973c8..24b3c66092a47 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cos.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cos.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Cos extends Function with SimpleTypedFunction {
   def name = "cos"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cot.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cot.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cot.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cot.scala
index 86d922261edb2..09bcbcba802eb 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Cot.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Cot.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Cot extends Function with SimpleTypedFunction {
   def name = "cot"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Count.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Count.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Count.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Count.scala
index 7b4b9b70233f7..64ea8e4da2dd4 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Count.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Count.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Count extends AggregatingFunction with SimpleTypedFunction {
   def name = "count"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Degrees.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Degrees.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Degrees.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Degrees.scala
index 8ee9342f2dfca..1054800ecf900 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Degrees.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Degrees.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Degrees extends Function with SimpleTypedFunction {
   def name = "degrees"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Distance.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Distance.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Distance.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Distance.scala
index 14e1d7f19845a..6fe474b99b00c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Distance.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Distance.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Distance extends Function with SimpleTypedFunction {
   def name = "distance"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/E.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/E.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/E.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/E.scala
index 3c80460278c7d..8cf0051d6b35e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/E.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/E.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object E extends Function with SimpleTypedFunction {
   def name = "e"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/EndNode.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/EndNode.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/EndNode.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/EndNode.scala
index a9a6a81f895e1..acd1226e23690 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/EndNode.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/EndNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object EndNode extends Function with SimpleTypedFunction {
   def name = "endNode"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exists.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exists.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exists.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exists.scala
index 153706213b09c..9e1d41cabbdc9 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exists.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exists.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ContainerIndex, Function}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticError, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ContainerIndex, Function}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticError, ast}
 
 case object Exists extends Function {
   def name = "EXISTS"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exp.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exp.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exp.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exp.scala
index bdfe9d22ebc3a..919f0e40f0bc6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Exp.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Exp.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Exp extends Function with SimpleTypedFunction {
   def name = "exp"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Floor.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Floor.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Floor.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Floor.scala
index 5043ebed85d99..0a97898345d48 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Floor.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Floor.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Floor extends Function with SimpleTypedFunction {
   def name = "floor"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Has.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Has.scala
similarity index 82%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Has.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Has.scala
index 00a703b7037c1..30fa6c55d4b5d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Has.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Has.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{ContainerIndex, Function}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticError, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{ContainerIndex, Function}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticError, ast}
 
 /*
  * Note that HAS has been removed from Cypher,
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Haversin.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Haversin.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Haversin.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Haversin.scala
index 4c7096fd3922b..80fe9062f4714 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Haversin.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Haversin.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Haversin extends Function with SimpleTypedFunction {
   def name = "haversin"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Head.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Head.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Head.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Head.scala
index 22889b7574e61..fd69ca0a4b0dd 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Head.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Head.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Function
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{TypeGenerator, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Function
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{TypeGenerator, ast}
 
 case object Head extends Function {
   def name = "head"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Id.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Id.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Id.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Id.scala
index b5942b3931359..bf69c697a2392 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Id.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Id.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{SimpleTypedFunction, Function}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{SimpleTypedFunction, Function}
 
 case object Id extends Function with SimpleTypedFunction {
   def name = "id"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Keys.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Keys.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Keys.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Keys.scala
index 5b6efb10c1fde..28eb686e0339b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Keys.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Keys.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Keys extends Function with SimpleTypedFunction {
   def name = "keys"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LTrim.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LTrim.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LTrim.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LTrim.scala
index 39abe5d071481..33a6615d87001 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LTrim.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LTrim.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object LTrim extends Function with SimpleTypedFunction {
   def name = "ltrim"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Labels.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Labels.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Labels.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Labels.scala
index 8c708ef4f55ce..516d7b21704de 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Labels.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Labels.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Labels extends Function with SimpleTypedFunction {
   def name = "labels"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Last.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Last.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Last.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Last.scala
index 53fb978164015..dbbf89bbb940f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Last.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Last.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Function
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheck, TypeGenerator, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Function
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheck, TypeGenerator, ast}
 
 case object Last extends Function {
   def name = "last"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Left.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Left.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Left.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Left.scala
index c870a660c6084..5d19495a0ff85 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Left.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Left.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Left extends Function with SimpleTypedFunction {
   def name = "left"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Length.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Length.scala
similarity index 82%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Length.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Length.scala
index ed62332d6009d..22494c244ecaf 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Length.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Length.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheckResult, SemanticState}
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{FunctionInvocation, Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.notification.LengthOnNonPathNotification
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheckResult, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{FunctionInvocation, Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.notification.LengthOnNonPathNotification
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Length extends Function with SimpleTypedFunction {
   def name = "length"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log.scala
index 2d3fee875254a..009f12c55f7ed 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Log extends Function with SimpleTypedFunction {
   def name = "log"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log10.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log10.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log10.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log10.scala
index 26c84da60eba4..4a4b09d2b8c30 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Log10.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Log10.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Log10 extends Function with SimpleTypedFunction {
   def name = "log10"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Lower.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Lower.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Lower.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Lower.scala
index eecf95d260568..e309bf1616126 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Lower.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Lower.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Lower extends Function with SimpleTypedFunction {
   def name = "lower"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Max.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Max.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Max.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Max.scala
index 8efc06920f4b8..74f41dd71d6ae 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Max.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Max.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Max extends AggregatingFunction with SimpleTypedFunction {
   def name = "max"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Min.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Min.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Min.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Min.scala
index 7a6f29fe892b7..176f4c162fa56 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Min.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Min.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Min extends AggregatingFunction with SimpleTypedFunction {
   def name = "min"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Nodes.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Nodes.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Nodes.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Nodes.scala
index acef92d58c63c..b3018fb9bca12 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Nodes.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Nodes.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Nodes extends Function with SimpleTypedFunction {
   def name = "nodes"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileCont.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileCont.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileCont.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileCont.scala
index 632684a25253b..3877f0e3fec27 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileCont.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileCont.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, FunctionInvocation, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, FunctionInvocation, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object PercentileCont extends AggregatingFunction with SimpleTypedFunction {
   def name = "percentileCont"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDisc.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDisc.scala
similarity index 82%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDisc.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDisc.scala
index 035d442e0f6ef..29650f23921a2 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDisc.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDisc.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Parameter, AggregatingFunction, DoubleLiteral, FunctionInvocation, Literal, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheck, SemanticCheckResult, SemanticError}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Parameter, AggregatingFunction, DoubleLiteral, FunctionInvocation, Literal, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheck, SemanticCheckResult, SemanticError}
 
 case object PercentileDisc extends AggregatingFunction with SimpleTypedFunction {
   def name = "percentileDisc"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Pi.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Pi.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Pi.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Pi.scala
index 9b83fd775b621..133ba1958e0e1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Pi.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Pi.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Pi extends Function with SimpleTypedFunction {
   def name = "pi"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Point.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Point.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Point.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Point.scala
index 43fba8726b4f7..3061ccbea453b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Point.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Point.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Point extends Function with SimpleTypedFunction {
   def name = "point"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Properties.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Properties.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Properties.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Properties.scala
index c5c1163b5c3a0..132326b59d031 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Properties.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Properties.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Properties extends Function with SimpleTypedFunction {
   override def name = "properties"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/RTrim.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/RTrim.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/RTrim.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/RTrim.scala
index b879315723215..5752bc171dbbd 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/RTrim.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/RTrim.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object RTrim extends Function with SimpleTypedFunction {
   def name = "rtrim"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Radians.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Radians.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Radians.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Radians.scala
index c66d2878f1060..da67eca0e5547 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Radians.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Radians.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Radians extends Function with SimpleTypedFunction {
   def name = "radians"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rand.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rand.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rand.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rand.scala
index b1a98c016f290..19166f5d2a5d2 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rand.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rand.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Rand extends Function with SimpleTypedFunction {
   val name = "rand"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Range.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Range.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Range.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Range.scala
index d172bf3e2736b..849e03c0359fb 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Range.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Range.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Range extends Function with SimpleTypedFunction {
   def name = "range"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reduce.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reduce.scala
similarity index 88%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reduce.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reduce.scala
index aa6928e265183..620982a388a86 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reduce.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reduce.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Function
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticCheck, SemanticError, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Function
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticCheck, SemanticError, ast}
 
 // this implementation exists only to handle the case where "reduce(x = 0, x in y : foo)" is parsed as a function invocation,
 // rather than a ReduceExpression
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Relationships.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Relationships.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Relationships.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Relationships.scala
index 3568a2da162e7..5f18ed1c68336 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Relationships.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Relationships.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Relationships extends Function with SimpleTypedFunction {
   def name = "relationships"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rels.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rels.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rels.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rels.scala
index ced6b27023358..9181a21a9a03f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Rels.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Rels.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{SimpleTypedFunction, Function}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{SimpleTypedFunction, Function}
 
 case object Rels extends Function with SimpleTypedFunction {
   def name = "rels"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Replace.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Replace.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Replace.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Replace.scala
index bedb5f2c213b0..6b028e4f8ec34 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Replace.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Replace.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Replace extends Function with SimpleTypedFunction {
   def name = "replace"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reverse.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reverse.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reverse.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reverse.scala
index 9c185c3830f86..0883b623a42c5 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Reverse.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Reverse.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Reverse extends Function with SimpleTypedFunction {
   def name = "reverse"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Right.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Right.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Right.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Right.scala
index 75bccec640dcb..bc232f2fd9ec0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Right.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Right.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Right extends Function with SimpleTypedFunction {
   def name = "right"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Round.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Round.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Round.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Round.scala
index 9a139a72321e3..4e5e82b0017a0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Round.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Round.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Round extends Function with SimpleTypedFunction {
   def name = "round"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sign.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sign.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sign.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sign.scala
index f3d412ac78a52..dc5f313cb57b0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sign.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sign.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Sign extends Function with SimpleTypedFunction {
   def name = "sign"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sin.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sin.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sin.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sin.scala
index 17c65f79929c4..6077b3cdf597b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sin.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sin.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Sin extends Function with SimpleTypedFunction {
   def name = "sin"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Size.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Size.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Size.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Size.scala
index c06923cbc1b39..e354059b0147f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Size.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Size.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Size extends Function with SimpleTypedFunction {
   def name = "size"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Split.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Split.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Split.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Split.scala
index 262868edc8c7b..7abc36f2bd681 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Split.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Split.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Split extends Function with SimpleTypedFunction {
   def name = "split"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sqrt.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sqrt.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sqrt.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sqrt.scala
index 7f692011d5ea2..744edaf0a4269 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sqrt.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sqrt.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Sqrt extends Function with SimpleTypedFunction {
   def name = "sqrt"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StartNode.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StartNode.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StartNode.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StartNode.scala
index ca88656841c21..e8c23936dc0fa 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StartNode.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StartNode.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object StartNode extends Function with SimpleTypedFunction {
   def name = "startNode"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDev.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDev.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDev.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDev.scala
index 603980f63fffd..e10dcfe278e22 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDev.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDev.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object StdDev extends AggregatingFunction with SimpleTypedFunction {
   def name = "stdev"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDevP.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDevP.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDevP.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDevP.scala
index 8a84b1e3a3b6a..90dffc6d050b0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/StdDevP.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/StdDevP.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object StdDevP extends AggregatingFunction with SimpleTypedFunction {
   def name = "stdevp"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Substring.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Substring.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Substring.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Substring.scala
index 1a4a9399125a0..b6ba1c4dae75c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Substring.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Substring.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Substring extends Function with SimpleTypedFunction {
   def name = "substring"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sum.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sum.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sum.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sum.scala
index 4ebd808842a8f..4570038e5a356 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Sum.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Sum.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{AggregatingFunction, Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{AggregatingFunction, Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 
 case object Sum extends AggregatingFunction with SimpleTypedFunction {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tail.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tail.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tail.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tail.scala
index f37ccdbed6d14..99a8a69aacb97 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tail.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tail.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Function
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Function
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Tail extends Function {
   def name = "tail"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tan.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tan.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tan.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tan.scala
index fc06e1d30b03a..788f614cf2140 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Tan.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Tan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Tan extends Function with SimpleTypedFunction {
   def name = "tan"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Timestamp.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Timestamp.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Timestamp.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Timestamp.scala
index fb280797dad20..91820e82b1893 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Timestamp.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Timestamp.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Timestamp extends Function with SimpleTypedFunction {
   val name = "timestamp"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloat.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloat.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloat.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloat.scala
index cf7eec08b5c7d..fd379361cd4fe 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloat.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloat.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object ToFloat extends Function with SimpleTypedFunction {
   def name = "toFloat"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToInt.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToInt.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToInt.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToInt.scala
index 0d1c18f47348e..50e539ac024a6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToInt.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToInt.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object ToInt extends Function with SimpleTypedFunction {
   def name = "toInt"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToLower.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToLower.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToLower.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToLower.scala
index f7b98ecba6333..1f735fb7f2004 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToLower.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToLower.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object ToLower extends Function with SimpleTypedFunction {
   def name = "ToLower"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToString.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToString.scala
similarity index 87%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToString.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToString.scala
index 3228326f2f972..7c3e4d5edb4e1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToString.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToString.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object ToString extends Function with SimpleTypedFunction {
   def name = "toString"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToUpper.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToUpper.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToUpper.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToUpper.scala
index 802881fb82016..53b1e8d006ab1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToUpper.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToUpper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object ToUpper extends Function with SimpleTypedFunction {
   def name = "toUpper"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Trim.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Trim.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Trim.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Trim.scala
index 632b2fb05a838..68eee906c0158 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Trim.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Trim.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Trim extends Function with SimpleTypedFunction {
   def name = "trim"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Type.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Type.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Type.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Type.scala
index f00c5e6f944c8..ce5b4c9817fc4 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Type.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Type.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Type extends Function with SimpleTypedFunction {
   def name = "type"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Upper.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Upper.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Upper.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Upper.scala
index ac9d5d2f58737..dd083128d7d7d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/Upper.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/Upper.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.{Function, SimpleTypedFunction}
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.{Function, SimpleTypedFunction}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 case object Upper extends Function with SimpleTypedFunction {
   def name = "upper"
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/hasAggregateButIsNotAggregate.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/hasAggregateButIsNotAggregate.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/hasAggregateButIsNotAggregate.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/hasAggregateButIsNotAggregate.scala
index 3f671761d5299..5fde21667033d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/hasAggregateButIsNotAggregate.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/hasAggregateButIsNotAggregate.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
 object hasAggregateButIsNotAggregate extends (Expression => Boolean)  {
   def apply(expression: Expression): Boolean = expression match {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/Eagerly.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/Eagerly.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/Eagerly.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/Eagerly.scala
index cd7c0d49275bb..36249a124e61a 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/Eagerly.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/Eagerly.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
 import scala.collection.{immutable, mutable}
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyList.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyList.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyList.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyList.scala
index e0edab95629c6..91e6aa2a0df47 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyList.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyList.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 
 import scala.annotation.tailrec
 import scala.collection.generic.CanBuildFrom
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelper.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelper.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelper.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelper.scala
index 4c65fcaebbc0c..6e596fda41570 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelper.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelper.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
 import org.apache.commons.lang3.SystemUtils
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/TreeZipper.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/TreeZipper.scala
similarity index 99%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/TreeZipper.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/TreeZipper.scala
index ab8999f54d0d1..e1ff073ba69c9 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/TreeZipper.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/TreeZipper.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
 import scala.annotation.tailrec
 import scala.reflect.ClassTag
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/fixedPoint.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/fixedPoint.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/fixedPoint.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/fixedPoint.scala
index ee106c243800f..aea748e7c4a33 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/fixedPoint.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/fixedPoint.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
 import scala.annotation.tailrec
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/notification/InternalNotification.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/notification/InternalNotification.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/notification/InternalNotification.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/notification/InternalNotification.scala
index 5f2b358a88ea5..f2e88eb1c5c22 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/notification/InternalNotification.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/notification/InternalNotification.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.notification
+package org.neo4j.cypher.internal.frontend.v3_1.notification
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 
 /**
  * Describes a notification
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/package.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/package.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/package.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/package.scala
index e727a2cde7766..7b310bbc5d126 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/package.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/package.scala
@@ -19,10 +19,10 @@
  */
 package org.neo4j.cypher.internal.frontend
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.NonEmptyList
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
 
-package object v3_0 {
+package object v3_1 {
   type Rewriter = (AnyRef => AnyRef)
 
   type Bounds[+V] = NonEmptyList[Bound[V]]
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Base.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Base.scala
similarity index 99%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Base.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Base.scala
index 14d767451de92..71992bd82cd36 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Base.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Base.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, InternalException, SyntaxException}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, InternalException, SyntaxException}
 import org.parboiled.Context
 import org.parboiled.errors.{InvalidInputError, ParseError}
 import org.parboiled.scala._
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BufferPosition.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BufferPosition.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BufferPosition.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BufferPosition.scala
index b5c328b0453d1..4a0efa8583b7f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BufferPosition.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BufferPosition.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
 import org.parboiled.Context
 import org.parboiled.buffers.InputBuffer
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Clauses.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Clauses.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Clauses.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Clauses.scala
index ea20698d61e03..2034b85c7bcb0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Clauses.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Clauses.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast
 import org.parboiled.scala._
 
 trait Clauses extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Command.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Command.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Command.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Command.scala
index 81ec95644a78e..e7c6cecd90315 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Command.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Command.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression
 import org.parboiled.scala._
 
 import scala.collection.immutable.IndexedSeq
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/CypherParser.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/CypherParser.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/CypherParser.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/CypherParser.scala
index 4b0484f772987..c9171697054c4 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/CypherParser.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/CypherParser.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, SyntaxException, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, SyntaxException, ast}
 import org.parboiled.scala._
 
 class CypherParser extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Expressions.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Expressions.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Expressions.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Expressions.scala
index 8e22dcfe3be50..66e66da290635 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Expressions.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Expressions.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, ast}
 import org.parboiled.scala._
 
 import scala.collection.mutable.ListBuffer
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/InvalidInputErrorFormatter.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/InvalidInputErrorFormatter.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/InvalidInputErrorFormatter.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/InvalidInputErrorFormatter.scala
index 8fde444b02699..17182fd63ce0d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/InvalidInputErrorFormatter.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/InvalidInputErrorFormatter.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 import org.parboiled.common.StringUtils
 import org.parboiled.errors.{DefaultInvalidInputErrorFormatter, InvalidInputError}
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LikePatternParser.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LikePatternParser.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LikePatternParser.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LikePatternParser.scala
index 9992d78a512c9..ab82f67b062b8 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LikePatternParser.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LikePatternParser.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 import org.parboiled.scala._
 import org.parboiled.scala.parserunners.ReportingParseRunner
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Literals.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Literals.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Literals.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Literals.scala
index 374bf1f9d243e..8018372f60aed 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Literals.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Literals.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 import org.parboiled.scala._
 
 trait Literals extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Patterns.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Patterns.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Patterns.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Patterns.scala
index 8d55d009a39e3..d3149e4b18aae 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Patterns.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Patterns.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 /*
  *|                                            NamedPatternPart                                            |
@@ -29,7 +29,7 @@ package org.neo4j.cypher.internal.frontend.v3_0.parser
  *    p =      shortestPath(    (a)             -[r1]->           (b)            -[r2]->           (c)       )
  */
 
-import org.neo4j.cypher.internal.frontend.v3_0.{SemanticDirection, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.{SemanticDirection, ast}
 import org.parboiled.scala._
 
 trait Patterns extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCalls.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCalls.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCalls.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCalls.scala
index 0a3928919852f..80915ce25153c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCalls.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCalls.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
-import org.neo4j.cypher.internal.frontend.v3_0.ast._
+import org.neo4j.cypher.internal.frontend.v3_1.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast._
 import org.parboiled.scala._
 
 trait ProcedureCalls {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Query.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Query.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Query.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Query.scala
index df299c6b88397..07d7eb63bddb4 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Query.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Query.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast
 import org.parboiled.scala._
 
 trait Query extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/StartPoints.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/StartPoints.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/StartPoints.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/StartPoints.scala
index 6c3f6f2d87df7..131587c43d5a3 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/StartPoints.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/StartPoints.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, ast}
 import org.parboiled.scala._
 
 trait StartPoints extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Statement.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Statement.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Statement.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Statement.scala
index ffa6ba89cb1b7..a64a4aafa6fc6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Statement.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Statement.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast
 import org.parboiled.scala._
 
 trait Statement extends Parser
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Strings.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Strings.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Strings.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Strings.scala
index cafb17ea297d2..35d00609fac9a 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/Strings.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/Strings.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 import org.parboiled.Context
 import org.parboiled.scala._
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/convertLikePatternToRegex.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/convertLikePatternToRegex.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/convertLikePatternToRegex.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/convertLikePatternToRegex.scala
index 76212c7bff59f..86a3f193fb5c0 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/convertLikePatternToRegex.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/convertLikePatternToRegex.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 import java.util.regex.Pattern._
 
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierPartMatcher.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierPartMatcher.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierPartMatcher.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierPartMatcher.scala
index f82316f2dc0d7..86ce87fc0c787 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierPartMatcher.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierPartMatcher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser.matchers
+package org.neo4j.cypher.internal.frontend.v3_1.parser.matchers
 
 class IdentifierPartMatcher extends ScalaCharMatcher("an identifier character") {
   protected def matchChar(c: Char): Boolean = Character.isJavaIdentifierPart(c)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierStartMatcher.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierStartMatcher.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierStartMatcher.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierStartMatcher.scala
index 6fb22e3caaeaf..768279292f61d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/IdentifierStartMatcher.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/IdentifierStartMatcher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser.matchers
+package org.neo4j.cypher.internal.frontend.v3_1.parser.matchers
 
 class IdentifierStartMatcher extends ScalaCharMatcher("an identifier") {
   protected def matchChar(c: Char): Boolean = Character.isJavaIdentifierStart(c)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/ScalaCharMatcher.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/ScalaCharMatcher.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/ScalaCharMatcher.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/ScalaCharMatcher.scala
index 3c9675ed2aeea..508b86ef0c765 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/ScalaCharMatcher.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/ScalaCharMatcher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser.matchers
+package org.neo4j.cypher.internal.frontend.v3_1.parser.matchers
 
 import org.parboiled.MatcherContext
 import org.parboiled.matchers.CustomMatcher
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/WhitespaceCharMatcher.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/WhitespaceCharMatcher.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/WhitespaceCharMatcher.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/WhitespaceCharMatcher.scala
index 56432311baad6..fcc732c66c0ff 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/matchers/WhitespaceCharMatcher.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/matchers/WhitespaceCharMatcher.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser.matchers
+package org.neo4j.cypher.internal.frontend.v3_1.parser.matchers
 
 class WhitespaceCharMatcher extends ScalaCharMatcher("whitespace") {
   protected def matchChar(c: Char): Boolean = c.isWhitespace
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/package.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/package.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/package.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/package.scala
index d5a6f18817253..fdd99db96a0a1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/package.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/package.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.parser.matchers._
+import org.neo4j.cypher.internal.frontend.v3_1.parser.matchers._
 import org.parboiled.scala._
 
 package object parser {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/spi/MapToPublicExceptions.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/spi/MapToPublicExceptions.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/spi/MapToPublicExceptions.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/spi/MapToPublicExceptions.scala
index 6fd3e553a4b9b..92b6e8d37ef3c 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/spi/MapToPublicExceptions.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/spi/MapToPublicExceptions.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.spi
+package org.neo4j.cypher.internal.frontend.v3_1.spi
 
-import org.neo4j.cypher.internal.frontend.v3_0.CypherException
+import org.neo4j.cypher.internal.frontend.v3_1.CypherException
 
 trait MapToPublicExceptions[T <: Throwable] {
   def failedIndexException(indexName: String, cause: Throwable): T
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/AnyType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/AnyType.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/AnyType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/AnyType.scala
index 08dc5f2546992..64b864704a58d 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/AnyType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/AnyType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object AnyType {
   val instance = new AnyType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/BooleanType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/BooleanType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/BooleanType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/BooleanType.scala
index 157d33f93b0d0..3b8e613095567 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/BooleanType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/BooleanType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object BooleanType {
   val instance = new BooleanType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherType.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherType.scala
index 85a94300596f0..4bb5c17a659ed 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 abstract class CypherType {
   def parentType: CypherType
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/FloatType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/FloatType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/FloatType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/FloatType.scala
index 03c23f6ecc149..e0ba454b70c2f 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/FloatType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/FloatType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object FloatType {
   val instance = new FloatType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/IntegerType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/IntegerType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/IntegerType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/IntegerType.scala
index 230e41d949496..33f080a7f74c6 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/IntegerType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/IntegerType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object IntegerType {
   val instance = new IntegerType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/ListType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/ListType.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/ListType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/ListType.scala
index 0beac50bf0652..cf23df98b828b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/ListType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/ListType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object ListType {
   private val anyCollectionTypeInstance = new ListTypeImpl(CTAny)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/MapType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/MapType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/MapType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/MapType.scala
index 6683f647fb539..c482b4fd9d9ca 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/MapType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/MapType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object MapType {
   val instance = new MapType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NodeType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NodeType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NodeType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NodeType.scala
index 3d17d2b9e8f25..0a67f6b0ac725 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NodeType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NodeType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object NodeType {
   val instance = new NodeType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NumberType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NumberType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NumberType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NumberType.scala
index 14b1a8ec25d10..85101e12a734b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/NumberType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/NumberType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object NumberType {
   val instance = new NumberType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PathType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PathType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PathType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PathType.scala
index 5ff26c8eda77f..eeb7e48dee557 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PathType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PathType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object PathType {
   val instance = new PathType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PointType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PointType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PointType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PointType.scala
index d2e25f40cd289..7913391eb03b9 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/PointType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/PointType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object PointType {
   val instance = new PointType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/RelationshipType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/RelationshipType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/RelationshipType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/RelationshipType.scala
index c312672774589..778b22f33ad16 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/RelationshipType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/RelationshipType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object RelationshipType {
   val instance = new RelationshipType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/StringType.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/StringType.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/StringType.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/StringType.scala
index 1110170cb9e11..e6cac03a2304b 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/StringType.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/StringType.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object StringType {
   val instance = new StringType() {
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRange.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRange.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRange.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRange.scala
index 431a1ec294f22..c71907c82967e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRange.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRange.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object TypeRange {
   def apply(lower: CypherType, upper: CypherType): TypeRange = TypeRange(lower, Some(upper))
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpec.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpec.scala
similarity index 99%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpec.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpec.scala
index 8ccbc9335dc5f..5055a3e173ba1 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpec.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpec.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
 object TypeSpec {
   def exact(types: CypherType*): TypeSpec = exact(types)
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/package.scala b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/package.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/package.scala
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/package.scala
index e49e2a21adc14..55a6ef5d7804e 100644
--- a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/package.scala
+++ b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/package.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 package object symbols {
   val CTAny: AnyType = AnyType.instance
diff --git a/community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/type_system.txt b/community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/type_system.txt
similarity index 100%
rename from community/cypher/frontend-3.0/src/main/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/type_system.txt
rename to community/cypher/frontend-3.1/src/main/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/type_system.txt
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/DummyPosition.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/DummyPosition.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/DummyPosition.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/DummyPosition.scala
index e19d5511c3279..46584d8cdc88f 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/DummyPosition.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/DummyPosition.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
 object DummyPosition {
   def apply(offset: Int) = new InputPosition(offset, 1, offset)
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/FoldableTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/FoldableTest.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/FoldableTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/FoldableTest.scala
index b6fa822742283..8cce33d07a192 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/FoldableTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/FoldableTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 object FoldableTest {
   trait Exp extends Foldable
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RepeatTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RepeatTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RepeatTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RepeatTest.scala
index 226914193ede6..cb4160a7f7d04 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RepeatTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RepeatTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.fixedPoint
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.fixedPoint
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RepeatTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RewritableTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RewritableTest.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RewritableTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RewritableTest.scala
index d6c54b2f82b0f..06a62e5d346f0 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/RewritableTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/RewritableTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0
+package org.neo4j.cypher.internal.frontend.v3_1
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 object RewritableTest {
   trait Exp extends Product with Rewritable
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNodeTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNodeTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNodeTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNodeTest.scala
index 1ed86c77e51ab..2f5d1b6ddcc88 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ASTNodeTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ASTNodeTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ASTNodeTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AddTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AddTest.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AddTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AddTest.scala
index cafa11840e3f0..1297ac8ace861 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AddTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AddTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class AddTest extends InfixExpressionTestBase(Add(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndTest.scala
index 968ff33327cc3..15a635be09bad 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AndTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AndTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class AndTest extends InfixExpressionTestBase(And(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AstConstructionTestSupport.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AstConstructionTestSupport.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AstConstructionTestSupport.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AstConstructionTestSupport.scala
index 348e1167a0e19..49a29b5fd8e27 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/AstConstructionTestSupport.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/AstConstructionTestSupport.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherTestSupport
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherTestSupport
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, InputPosition}
 
 trait AstConstructionTestSupport extends CypherTestSupport {
   protected val pos = DummyPosition(0)
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpressionTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpressionTest.scala
index 2e9d154edfa6f..073c23cda143a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CaseExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CaseExpressionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticState}
 
 class CaseExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CollectionSliceTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CollectionSliceTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CollectionSliceTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CollectionSliceTest.scala
index c3910faab9dde..2b1d659c23548 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/CollectionSliceTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/CollectionSliceTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class CollectionSliceTest extends CypherFunSuite {
   val dummyList = DummyExpression(
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConnectedComponentsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConnectedComponentsTest.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConnectedComponentsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConnectedComponentsTest.scala
index 302751f39c2b4..ebd1030ec9677 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConnectedComponentsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConnectedComponentsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ConnectedComponentsTest extends CypherFunSuite {
   import connectedComponents._
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpressionTest.scala
similarity index 87%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpressionTest.scala
index d4d0556d6d47f..0ce5b49b84219 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ConstantExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ConstantExpressionTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ConstantExpressionTest extends CypherFunSuite {
   test("tests") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainerIndexTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainerIndexTest.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainerIndexTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainerIndexTest.scala
index 7748f71870b18..0dc8d63ff1a31 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainerIndexTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainerIndexTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class ContainerIndexTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainsAggregateTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainsAggregateTest.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainsAggregateTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainsAggregateTest.scala
index c4158c0d924c2..1f8bc4a865fcf 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ContainsAggregateTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ContainsAggregateTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ContainsAggregateTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DecimalDoubleLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DecimalDoubleLiteralTest.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DecimalDoubleLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DecimalDoubleLiteralTest.scala
index 11759e6dd774e..8f3654f9c7b93 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DecimalDoubleLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DecimalDoubleLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class DecimalDoubleLiteralTest extends CypherFunSuite {
   test("correctly parses decimal numbers") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DivideTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DivideTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DivideTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DivideTest.scala
index 0005800d3c096..64ed039c76332 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DivideTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DivideTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class DivideTest extends InfixExpressionTestBase(Divide(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DummyExpression.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DummyExpression.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DummyExpression.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DummyExpression.scala
index b8d83c1d10e95..21cad801d20d3 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/DummyExpression.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/DummyExpression.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols.TypeSpec
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, InputPosition}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols.TypeSpec
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, InputPosition}
 
 case class DummyExpression(possibleTypes: TypeSpec, position: InputPosition = DummyPosition(0))
   extends Expression with SimpleTyping
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExpressionTest.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExpressionTest.scala
index b80097c802bb3..01dbd8dedb42a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExpressionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, IdentityMap, SemanticDirection, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, IdentityMap, SemanticDirection, SemanticState}
 
 class ExpressionTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExtractExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExtractExpressionTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExtractExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExtractExpressionTest.scala
index d45c2b148a705..854e9a93e40bd 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ExtractExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ExtractExpressionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class ExtractExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FilterExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FilterExpressionTest.scala
similarity index 88%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FilterExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FilterExpressionTest.scala
index dfbabc21783b7..92532f53ae247 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FilterExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FilterExpressionTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class FilterExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FindDuplicateRelationshipsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FindDuplicateRelationshipsTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FindDuplicateRelationshipsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FindDuplicateRelationshipsTest.scala
index c71076ae1795b..e3ae3b5deae79 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FindDuplicateRelationshipsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FindDuplicateRelationshipsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticDirection}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticDirection}
 
 class FindDuplicateRelationshipsTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionNameTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionNameTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionNameTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionNameTest.scala
index 0ec8f2601f8c5..fd81df63715b4 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/FunctionNameTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/FunctionNameTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class FunctionNameTest extends CypherFunSuite {
   test("equality should ignore case") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanOrEqualTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanOrEqualTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanOrEqualTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanOrEqualTest.scala
index cf5f02342152f..3c1e28de678ad 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanOrEqualTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanOrEqualTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class GreaterThanOrEqualTest extends InfixExpressionTestBase(GreaterThanOrEqual(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanTest.scala
index 4fe91e1e19fa3..794e7a5ec3608 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/GreaterThanTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/GreaterThanTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class GreaterThanTest extends InfixExpressionTestBase(GreaterThan(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HexIntegerLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HexIntegerLiteralTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HexIntegerLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HexIntegerLiteralTest.scala
index c0827912c785e..91797be7fe01d 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/HexIntegerLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/HexIntegerLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class HexIntegerLiteralTest extends CypherFunSuite {
   test("correctly parses hexadecimal numbers") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/InfixExpressionTestBase.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/InfixExpressionTestBase.scala
similarity index 86%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/InfixExpressionTestBase.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/InfixExpressionTestBase.scala
index 314110385d5fe..ed62c9e616634 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/InfixExpressionTestBase.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/InfixExpressionTestBase.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0._
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 abstract class InfixExpressionTestBase(ctr: (Expression, Expression) => Expression) extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregateTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregateTest.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregateTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregateTest.scala
index cdd85653e8fc5..04114b255c8f1 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/IsAggregateTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/IsAggregateTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class IsAggregateTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanOrEqualTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanOrEqualTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanOrEqualTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanOrEqualTest.scala
index c5e531aa100ea..67605174c24a0 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanOrEqualTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanOrEqualTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class LessThanOrEqualTest extends InfixExpressionTestBase(LessThanOrEqual(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanTest.scala
index c1240acf71f0e..b093d6cd0f026 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LessThanTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LessThanTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class LessThanTest extends InfixExpressionTestBase(LessThan(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ListComprehensionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ListComprehensionTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ListComprehensionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ListComprehensionTest.scala
index 4e009bd179b0e..3219cabca3f6a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ListComprehensionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ListComprehensionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
 
 class ListComprehensionTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LoadCSVTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LoadCSVTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LoadCSVTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LoadCSVTest.scala
index 783d4e13bf421..bf28390a1ab70 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/LoadCSVTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/LoadCSVTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class LoadCSVTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ModuloTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ModuloTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ModuloTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ModuloTest.scala
index c9cc2303f0a00..ee73c669ef5f9 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ModuloTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ModuloTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ModuloTest extends InfixExpressionTestBase(Modulo(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MultiplyTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MultiplyTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MultiplyTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MultiplyTest.scala
index 3aa9ae19b220f..53cfd8ce39118 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/MultiplyTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/MultiplyTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class MultiplyTest extends InfixExpressionTestBase(Multiply(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OctalIntegerLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OctalIntegerLiteralTest.scala
similarity index 88%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OctalIntegerLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OctalIntegerLiteralTest.scala
index debcc2fd4f8b0..8f79af486631c 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OctalIntegerLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OctalIntegerLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class OctalIntegerLiteralTest extends CypherFunSuite {
   test("correctly parses octal numbers") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OrTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OrTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OrTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OrTest.scala
index b7032e1d4abc0..3be36584ef463 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/OrTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/OrTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class OrTest extends InfixExpressionTestBase(Or(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHintTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHintTest.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHintTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHintTest.scala
index 1e00c327637cb..5de1c29ba1395 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PeriodicCommitHintTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PeriodicCommitHintTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, InputPosition, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, InputPosition, SemanticState}
 
 class PeriodicCommitHintTest extends CypherFunSuite with Positional {
   test("negative values should fail") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PowTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PowTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PowTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PowTest.scala
index 44edc008f1fe4..ccb1075d1802e 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/PowTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/PowTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class PowTest extends InfixExpressionTestBase(Pow(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProjectionClauseTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProjectionClauseTest.scala
similarity index 97%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProjectionClauseTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProjectionClauseTest.scala
index 6cc5785e90826..18d0623da9b78 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ProjectionClauseTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ProjectionClauseTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticState
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticState
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ProjectionClauseTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReduceExpressionTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReduceExpressionTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReduceExpressionTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReduceExpressionTest.scala
index e53036702604a..ba52f3f3c17aa 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReduceExpressionTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReduceExpressionTest.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticCheckResult, SemanticError, SemanticState}
 
 class ReduceExpressionTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItemsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItemsTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItemsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItemsTest.scala
index 4c7139c4d540c..99e75b4fb7000 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/ReturnItemsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/ReturnItemsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.SemanticState
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.SemanticState
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ReturnItemsTest extends CypherFunSuite with AstConstructionTestSupport {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetClauseTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetClauseTest.scala
similarity index 85%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetClauseTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetClauseTest.scala
index 7eda82c0c4a15..be0f3fa0d234a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SetClauseTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SetClauseTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticState}
 
 class SetClauseTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SignedDecimalIntegerLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SignedDecimalIntegerLiteralTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SignedDecimalIntegerLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SignedDecimalIntegerLiteralTest.scala
index 6b44193ce19bd..27171e58b3c5a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SignedDecimalIntegerLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SignedDecimalIntegerLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class SignedDecimalIntegerLiteralTest extends CypherFunSuite {
   test("correctly parses decimal numbers") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StatementReturnColumnsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StatementReturnColumnsTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StatementReturnColumnsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StatementReturnColumnsTest.scala
index 6c64d23aa3b38..9726d1c3bfee6 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StatementReturnColumnsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StatementReturnColumnsTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.parser.{CypherParser, ParserTest}
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.parser.{CypherParser, ParserTest}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StatementReturnColumnsTest extends CypherFunSuite with ParserTest[Statement, List[String]] {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StringLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StringLiteralTest.scala
similarity index 83%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StringLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StringLiteralTest.scala
index 4c40558ba5b87..f2ee451053c39 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/StringLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/StringLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticState}
 
 class StringLiteralTest extends CypherFunSuite {
   test("has type CTString") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SubtractTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SubtractTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SubtractTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SubtractTest.scala
index ff943382f76c3..c03fd29a5fd26 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/SubtractTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/SubtractTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class SubtractTest extends InfixExpressionTestBase(Subtract(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/UnsignedDecimalIntegerLiteralTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/UnsignedDecimalIntegerLiteralTest.scala
similarity index 87%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/UnsignedDecimalIntegerLiteralTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/UnsignedDecimalIntegerLiteralTest.scala
index 2a2057059921a..272061968f60b 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/UnsignedDecimalIntegerLiteralTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/UnsignedDecimalIntegerLiteralTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticError, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticError, SemanticState}
 
 class UnsignedDecimalIntegerLiteralTest extends CypherFunSuite {
   test("correctly parses decimal numbers") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/VariableTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/VariableTest.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/VariableTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/VariableTest.scala
index a0d5f82a0341f..18f3213fca0e3 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/VariableTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/VariableTest.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticState}
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticState}
 
 class VariableTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/XorTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/XorTest.scala
similarity index 89%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/XorTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/XorTest.scala
index d4e4223ff3379..f324981f3fa6d 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/XorTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/XorTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast
+package org.neo4j.cypher.internal.frontend.v3_1.ast
 
-import org.neo4j.cypher.internal.frontend.v3_0.DummyPosition
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.DummyPosition
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class XorTest extends InfixExpressionTestBase(Xor(_, _)(DummyPosition(0))) {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/AbsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/AbsTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/AbsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/AbsTest.scala
index b9bcf4a8eed0c..c84a337bd8ecd 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/AbsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/AbsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class AbsTest extends FunctionTestBase("abs") {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/DistanceTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/DistanceTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/DistanceTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/DistanceTest.scala
index c8c2e0385b33b..ce7c79b3619e8 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/DistanceTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/DistanceTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class DistanceTest extends FunctionTestBase("distance")  {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/FunctionTestBase.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/FunctionTestBase.scala
similarity index 84%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/FunctionTestBase.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/FunctionTestBase.scala
index ea8d2cc36e814..36c885e300cfe 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/FunctionTestBase.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/FunctionTestBase.scala
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.DummyExpression
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, SemanticCheckResult, SemanticState, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.DummyExpression
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, SemanticCheckResult, SemanticState, ast}
 
 abstract class FunctionTestBase(funcName: String) extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LabelsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LabelsTest.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LabelsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LabelsTest.scala
index 827d1c890d37a..23f71231b802d 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/LabelsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/LabelsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class LabelsTest extends FunctionTestBase("labels") {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileContTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileContTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileContTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileContTest.scala
index 6e79071e2f320..0af86bd785348 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileContTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileContTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class PercentileContTest extends FunctionTestBase("percentileCont") {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDiscTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDiscTest.scala
similarity index 90%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDiscTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDiscTest.scala
index 7b6ffca1c0133..3705346de827a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PercentileDiscTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PercentileDiscTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.Expression.SemanticContext
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.ast.Expression.SemanticContext
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class PercentileDiscTest extends FunctionTestBase("percentileDisc") {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PointTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PointTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PointTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PointTest.scala
index a85c4235091a9..90940b6a47202 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/PointTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/PointTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class PointTest extends FunctionTestBase("point")  {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/SplitTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/SplitTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/SplitTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/SplitTest.scala
index e8a3f172904d8..d3ecaeafb33d4 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/SplitTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/SplitTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 import scala.languageFeature.existentials
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloatTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloatTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloatTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloatTest.scala
index 1f825dd8639aa..5fd28542f3380 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToFloatTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToFloatTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ToFloatTest extends FunctionTestBase("toFloat")  {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToIntTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToIntTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToIntTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToIntTest.scala
index 16257df2cd6fd..0c33d6070458a 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToIntTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToIntTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ToIntTest extends FunctionTestBase("toInt")  {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToStringTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToStringTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToStringTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToStringTest.scala
index 162d6411f36aa..3d72dc80acbef 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/ast/functions/ToStringTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/ast/functions/ToStringTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.ast.functions
+package org.neo4j.cypher.internal.frontend.v3_1.ast.functions
 
-import org.neo4j.cypher.internal.frontend.v3_0.symbols._
+import org.neo4j.cypher.internal.frontend.v3_1.symbols._
 
 class ToStringTest extends FunctionTestBase("toString")  {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyListTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyListTest.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyListTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyListTest.scala
index 27cac34d91739..dcb09fd6020b7 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/NonEmptyListTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/NonEmptyListTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class NonEmptyListTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelperTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelperTest.scala
similarity index 92%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelperTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelperTest.scala
index ef3affb5231f8..bd0ecb11d7981 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/helpers/StringHelperTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/helpers/StringHelperTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.helpers
+package org.neo4j.cypher.internal.frontend.v3_1.helpers
 
 import org.apache.commons.lang3.SystemUtils
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class StringHelperTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BaseRulesTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BaseRulesTest.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BaseRulesTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BaseRulesTest.scala
index b709e94555555..31f8319041445 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/BaseRulesTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/BaseRulesTest.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
 import org.parboiled.scala._
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ComparisonTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ComparisonTest.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ComparisonTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ComparisonTest.scala
index badf470fb9116..42887eaccd6c2 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ComparisonTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ComparisonTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast
+import org.neo4j.cypher.internal.frontend.v3_1.ast
 
 class ComparisonTest extends ParserAstTest[ast.Expression] with Expressions {
   implicit val parser = Expression
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LiteralsTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LiteralsTest.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LiteralsTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LiteralsTest.scala
index 1038510589e08..6efeecd4cfaf8 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/LiteralsTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/LiteralsTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, ast}
 import org.parboiled.scala._
 
 class LiteralsTest extends ParserTest[Any, Any] with Literals {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserAstTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserAstTest.scala
similarity index 91%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserAstTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserAstTest.scala
index 718b636a28dda..a97af376de3e4 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserAstTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserAstTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.TestName
-import org.neo4j.cypher.internal.frontend.v3_0.{InputPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.TestName
+import org.neo4j.cypher.internal.frontend.v3_1.{InputPosition, ast}
 import org.parboiled.scala._
 
 trait ParserAstTest[AST] extends ParserTest[AST, AST] with TestName {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserTest.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserTest.scala
index 3e52ddf5032ed..d6790183b0150 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ParserTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ParserTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.InputPosition
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.InputPosition
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.parboiled.errors.InvalidInputError
 import org.parboiled.scala._
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCallParserTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCallParserTest.scala
similarity index 94%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCallParserTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCallParserTest.scala
index a4060b4f927c8..ab1d38fedcc58 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/parser/ProcedureCallParserTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/parser/ProcedureCallParserTest.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.parser
+package org.neo4j.cypher.internal.frontend.v3_1.parser
 
-import org.neo4j.cypher.internal.frontend.v3_0.ast.ProcedureResultItem
-import org.neo4j.cypher.internal.frontend.v3_0.{DummyPosition, ast}
+import org.neo4j.cypher.internal.frontend.v3_1.ast.ProcedureResultItem
+import org.neo4j.cypher.internal.frontend.v3_1.{DummyPosition, ast}
 
 class ProcedureCallParserTest
   extends ParserAstTest[ast.UnresolvedCall]
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherTypeTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherTypeTest.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherTypeTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherTypeTest.scala
index ceb4c44e2b01d..3d420ffb2385c 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/CypherTypeTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/CypherTypeTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class CypherTypeTest extends CypherFunSuite {
   test("parents should be full path up type tree branch") {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRangeTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRangeTest.scala
similarity index 98%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRangeTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRangeTest.scala
index 1313adeb7d13e..ec8e9a8103ec6 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeRangeTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeRangeTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TypeRangeTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpecTest.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpecTest.scala
similarity index 99%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpecTest.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpecTest.scala
index b09a7201a8b1b..3a0043f00b5b6 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/symbols/TypeSpecTest.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/symbols/TypeSpecTest.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.symbols
+package org.neo4j.cypher.internal.frontend.v3_1.symbols
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class TypeSpecTest extends CypherFunSuite {
 
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherFunSuite.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherFunSuite.scala
similarity index 96%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherFunSuite.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherFunSuite.scala
index 0a56f1beaadd7..97132db7e8394 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherFunSuite.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherFunSuite.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.test_helpers
+package org.neo4j.cypher.internal.frontend.v3_1.test_helpers
 
 import org.junit.runner.RunWith
 import org.mockito.ArgumentCaptor
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherTestSupport.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherTestSupport.scala
similarity index 93%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherTestSupport.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherTestSupport.scala
index 65b7c66f82276..d1209f00a70c6 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/CypherTestSupport.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/CypherTestSupport.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.test_helpers
+package org.neo4j.cypher.internal.frontend.v3_1.test_helpers
 
 // Inherited by test mixin classes that need to manage resources
 trait CypherTestSupport  {
diff --git a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/IgnoreAllTests.scala b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/IgnoreAllTests.scala
similarity index 95%
rename from community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/IgnoreAllTests.scala
rename to community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/IgnoreAllTests.scala
index 9ddb79e5fd81e..fd7a992cdaa06 100644
--- a/community/cypher/frontend-3.0/src/test/scala/org/neo4j/cypher/internal/frontend/v3_0/test_helpers/IgnoreAllTests.scala
+++ b/community/cypher/frontend-3.1/src/test/scala/org/neo4j/cypher/internal/frontend/v3_1/test_helpers/IgnoreAllTests.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.frontend.v3_0.test_helpers
+package org.neo4j.cypher.internal.frontend.v3_1.test_helpers
 
 import org.scalatest.Tag
 
diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
index 06e95d9eacb38..e218002924485 100644
--- a/community/cypher/pom.xml
+++ b/community/cypher/pom.xml
@@ -33,8 +33,8 @@
   </scm>
 
   <modules>
-    <module>frontend-3.0</module>
-    <module>cypher-compiler-3.0</module>
+    <module>frontend-3.1</module>
+    <module>cypher-compiler-3.1</module>
     <module>cypher</module>
     <module>acceptance</module>
     <module>compatibility-suite</module>
@@ -131,6 +131,7 @@
                       <rules>
                           <requireFilesDontExist>
                               <files>
+                                  <file>cypher-compiler-3.0</file>
                                   <file>cypher-compiler-2.3</file>
                               </files>
                           </requireFilesDontExist>
diff --git a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java
index 84dca70eeaaa7..250dcda081025 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java
@@ -88,7 +88,7 @@ public String doCypherRestCall( String endpoint, String scriptTemplate, Status s
         String script = createScript( scriptTemplate );
         String queryString = "{\"query\": \"" + script + "\",\"params\":{" + parameterString + "}}";
 
-        String snippet = org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier$.MODULE$.apply( script );
+        String snippet = org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier$.MODULE$.apply( script );
         gen().expectedStatus( status.getStatusCode() )
                 .payload( queryString )
                 .description( AsciidocHelper.createAsciiDocSnippet( "cypher", snippet ) );
diff --git a/enterprise/kernel/pom.xml b/enterprise/kernel/pom.xml
index 72e3793cc791f..62f0d9f291d9a 100644
--- a/enterprise/kernel/pom.xml
+++ b/enterprise/kernel/pom.xml
@@ -114,20 +114,20 @@
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-compiler-3.0</artifactId>
+      <artifactId>neo4j-cypher-compiler-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.0</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.1</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala b/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
index ef2125f0d0175..80be17c876d17 100644
--- a/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
+++ b/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher
 
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory
 
diff --git a/enterprise/kernel/src/test/scala/org/neo4j/internal/cypher/acceptance/PropertyExistenceConstraintAcceptanceTest.scala b/enterprise/kernel/src/test/scala/org/neo4j/internal/cypher/acceptance/PropertyExistenceConstraintAcceptanceTest.scala
index cc8a0ef011ddd..5057e11591eaa 100644
--- a/enterprise/kernel/src/test/scala/org/neo4j/internal/cypher/acceptance/PropertyExistenceConstraintAcceptanceTest.scala
+++ b/enterprise/kernel/src/test/scala/org/neo4j/internal/cypher/acceptance/PropertyExistenceConstraintAcceptanceTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.internal.cypher.acceptance
 
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
+import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
 import org.neo4j.kernel.api.exceptions.Status
 
 class PropertyExistenceConstraintAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsTestSupport
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
index c6d40842117bb..f629b14a9166e 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
@@ -24,8 +24,8 @@ import java.io.{File, PrintWriter, StringWriter}
 import org.junit.Test
 import org.neo4j.cypher._
 import org.neo4j.cypher.export.{DatabaseSubGraph, SubGraphExporter}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier
 import org.neo4j.cypher.internal.javacompat.GraphImpl
 import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/CollectionsAndMapsTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/CollectionsAndMapsTest.scala
index c203c154cf738..8ffd8db39de71 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/CollectionsAndMapsTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/CollectionsAndMapsTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.docgen
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CollectionsAndMapsTest extends ArticleTest {
   def assert(name: String, result: InternalExecutionResult) {}
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
index de2ab9e8ab4c4..3c316ad7c6912 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
@@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit
 import org.junit.{After, Before}
 import org.neo4j.cypher.example.JavaExecutionEngineDocTest
 import org.neo4j.cypher.export.{DatabaseSubGraph, SubGraphExporter}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
-import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier
+import org.neo4j.cypher.internal.frontend.v3_1.helpers.Eagerly
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.javacompat.GraphImpl
 import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/FunctionsTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/FunctionsTest.scala
index a7317ad49c4fd..47849591a57c2 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/FunctionsTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/FunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen
 
 import org.junit.Assert._
 import org.junit.Test
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.graphdb.Node
 import org.neo4j.visualization.graphviz.{AsciiDocSimpleStyle, GraphStyle}
 
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/PatternTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/PatternTest.scala
index 4908541358ba3..2b959bcabbe89 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/PatternTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/PatternTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.docgen
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 
 class PatternTest extends ArticleTest {
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/QueryPlanTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/QueryPlanTest.scala
index 1aab58163cb31..75d07d1893e27 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/QueryPlanTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/QueryPlanTest.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.docgen
 import org.hamcrest.CoreMatchers._
 import org.junit.Assert._
 import org.junit.Test
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.IndexSeekByRange
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.IndexSeekByRange
 
 class QueryPlanTest extends DocumentingTestBase with SoftReset {
   override val setupQueries = List(
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SchemaIndexTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SchemaIndexTest.scala
index 9e23adbf3a3da..12138bb6b7e78 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SchemaIndexTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SchemaIndexTest.scala
@@ -23,10 +23,10 @@ import org.hamcrest.CoreMatchers._
 import org.junit.Assert._
 import org.junit.Test
 import org.neo4j.cypher.QueryStatisticsTestSupport
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.pipes.IndexSeekByRange
-import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Planner
-import org.neo4j.cypher.internal.compiler.v3_0.{DPPlannerName, IDPPlannerName, RulePlannerName}
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.pipes.IndexSeekByRange
+import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Planner
+import org.neo4j.cypher.internal.compiler.v3_1.{DPPlannerName, IDPPlannerName, RulePlannerName}
 import org.neo4j.cypher.internal.helpers.GraphIcing
 
 class SchemaIndexTest extends DocumentingTestBase with QueryStatisticsTestSupport with GraphIcing {
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SyntaxTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SyntaxTest.scala
index f22a96a8e1f6c..78271bef5e0ed 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SyntaxTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/SyntaxTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.docgen
 
 import org.junit.Test
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class SyntaxTest extends DocumentingTestBase {
   override def graphDescription = List(
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/Document.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/Document.scala
index 6badf7d05c495..9a180da850a23 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/Document.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/Document.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.docgen.tooling
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 import org.neo4j.kernel.GraphDatabaseQueryService
 
 case class ContentWithInit(init: Seq[String], queryResultPlaceHolder: QueryResultPlaceHolder) {
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/DocumentingTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/DocumentingTest.scala
index a53a5f727d432..5d1ddb9f77949 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/DocumentingTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/DocumentingTest.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher.docgen.tooling
 
 import java.io._
 
-import org.neo4j.cypher.internal.compiler.v3_0.CypherSerializer
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.CypherSerializer
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.spi.TransactionalContextWrapper
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryResultContentBuilder.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryResultContentBuilder.scala
index e415ad19dcb4d..5c03100867360 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryResultContentBuilder.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryResultContentBuilder.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.docgen.tooling
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
 import org.neo4j.cypher.internal.helpers.GraphIcing
 
 /**
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryRunner.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryRunner.scala
index 26b08875316b2..a07173fb73f7b 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryRunner.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/QueryRunner.scala
@@ -20,8 +20,8 @@
 package org.neo4j.cypher.docgen.tooling
 
 import org.neo4j.cypher.internal.RewindableExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.frontend.v3_0.InternalException
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.frontend.v3_1.InternalException
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.coreapi.InternalTransaction
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
index b4e619462702c..1a4bd113e31c0 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
@@ -40,7 +40,7 @@ package org.neo4j.cypher.docgen.tooling
  */
 import org.neo4j.cypher.ExecutionEngineHelper
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.test.TestGraphDatabaseFactory
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
index b809bf0606575..d0b3fe181bc66 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.tooling
 
 import java.io.ByteArrayOutputStream
 
-import org.neo4j.cypher.internal.frontend.v3_0._
+import org.neo4j.cypher.internal.frontend.v3_1._
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.visualization.graphviz.{AsciiDocSimpleStyle, GraphvizWriter}
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/contentAndResultMerger.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/contentAndResultMerger.scala
index 12ae7a30b6fc2..ccefe024741f7 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/contentAndResultMerger.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/contentAndResultMerger.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.docgen.tooling
 
-import org.neo4j.cypher.internal.frontend.v3_0.Rewritable._
-import org.neo4j.cypher.internal.frontend.v3_0.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.frontend.v3_1.Rewritable._
+import org.neo4j.cypher.internal.frontend.v3_1.{Rewriter, bottomUp}
 
 /**
  * Takes the document tree and the execution results and rewrites the
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/ContentAndResultMergerTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/ContentAndResultMergerTest.scala
index ee9122d014af0..5c1dcb13e67f1 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/ContentAndResultMergerTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/ContentAndResultMergerTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.docgen.tooling.tests
 
 import org.neo4j.cypher.docgen.tooling._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class ContentAndResultMergerTest extends CypherFunSuite {
 
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/DocumentTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/DocumentTest.scala
index 51a8beee23c41..f05376bc8ad28 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/DocumentTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/DocumentTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.tooling.tests
 
 import org.neo4j.cypher.docgen.tooling.Admonitions._
 import org.neo4j.cypher.docgen.tooling._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class DocumentAsciiDocTest extends CypherFunSuite {
   test("Simplest possible document") {
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala
index 42459d73f2f08..81139d551a2d0 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.docgen.tooling.tests
 import org.neo4j.cypher.ExecutionEngineHelper
 import org.neo4j.cypher.docgen.tooling._
 import org.neo4j.cypher.internal.ExecutionEngine
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.test.TestGraphDatabaseFactory
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryRunnerTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryRunnerTest.scala
index 78b55acc6b286..5636f47429ea2 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryRunnerTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryRunnerTest.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher.docgen.tooling.tests
 
 import org.neo4j.cypher.SyntaxException
 import org.neo4j.cypher.docgen.tooling._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.coreapi.InternalTransaction
 import org.scalatest.exceptions.TestFailedException
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RestartableDatabaseTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RestartableDatabaseTest.scala
index e9dd16be3ce7a..47804bde08a94 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RestartableDatabaseTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RestartableDatabaseTest.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.docgen.tooling.tests
 import org.mockito.Mockito._
 import org.neo4j.cypher.CypherException
 import org.neo4j.cypher.docgen.tooling.RestartableDatabase
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 import org.neo4j.test.TestGraphDatabaseFactory
 
 class RestartableDatabaseTest extends CypherFunSuite {
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RunnableContentTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RunnableContentTest.scala
index 36a1ed86f5e18..208840c67863d 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RunnableContentTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/tests/RunnableContentTest.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.docgen.tooling.tests
 
 import org.neo4j.cypher.docgen.tooling._
-import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.frontend.v3_1.test_helpers.CypherFunSuite
 
 class RunnableContentTest extends CypherFunSuite {
   test("graph viz includes all init queries, and the actual query when inside a Query object") {
diff --git a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
index ef1eda3432640..ed5b50471da60 100644
--- a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
+++ b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier;
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier;
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService;
 
 class State
diff --git a/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala b/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala
index cf506afcf6c47..7c331e98f3ea7 100644
--- a/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala
+++ b/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.internal
 import java.util.{Map => JavaMap}
 
 import org.neo4j.cypher.SyntaxException
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.query.{QueryEngineProvider, QueryExecutionMonitor, QuerySession}
 import org.neo4j.logging.{LogProvider, NullLogProvider}
diff --git a/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java b/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
index ceb0665f1f496..3f58e3f80492f 100644
--- a/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
+++ b/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
@@ -26,7 +26,7 @@
 import java.util.Collections;
 
 import org.neo4j.cypher.internal.DocsExecutionEngine;
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult;
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.api.KernelTransaction;
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
index 24de02b066e10..8b400c05216e4 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
@@ -24,8 +24,8 @@ import java.nio.charset.StandardCharsets
 
 import org.junit.{After, Before, Test}
 import org.neo4j.cypher._
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier
 import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.javacompat.GraphImpl
 import org.neo4j.cypher.internal.{ExecutionEngine, ExecutionResult, RewindableExecutionResult}
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala
index 44c5a645f7b02..a0aadbc952a2d 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class AggregationTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CallTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CallTest.scala
index 4df0212ebc6d6..7f36c055e035f 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CallTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CallTest.scala
@@ -23,7 +23,7 @@ import org.junit.Before
 import org.neo4j.collection.RawIterator
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.kernel.api.KernelAPI
 import org.neo4j.kernel.api.exceptions.ProcedureException
 import org.neo4j.kernel.api.proc.CallableProcedure.{BasicProcedure, Context}
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CaseTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CaseTest.scala
index 25ddb9b9cfd87..609d6017adc12 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CaseTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CaseTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CaseTest extends RefcardTest with QueryStatisticsTestSupport {
   def graphDescription = List(
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionExpressionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionExpressionsTest.scala
index 14c5c9d7bcbbc..9b3c814f688d0 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionExpressionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionExpressionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CollectionExpressionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person KNOWS B:Person", "B KNOWS C:Person", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionPredicatesTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionPredicatesTest.scala
index 76c2ef377de08..12125ceed7105 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionPredicatesTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionPredicatesTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CollectionPredicatesTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionsTest.scala
index 10e23f48a1c8c..629db68b4ab7a 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CollectionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CollectionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A KNOWS B")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ConstraintTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ConstraintTest.scala
index bdcd9fb1fca78..b96b19cf6466f 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ConstraintTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ConstraintTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory
 
 class ConstraintTest extends RefcardTest with QueryStatisticsTestSupport {
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateTest.scala
index 0fbef9a6750a5..dfaa7122ed05c 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CreateTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateUniqueTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateUniqueTest.scala
index 26e4431abdb2c..bf476e8e44133 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateUniqueTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/CreateUniqueTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class CreateUniqueTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/DeleteTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/DeleteTest.scala
index 95d4b1d598a99..123c5e8b918ae 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/DeleteTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/DeleteTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class DeleteTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A:Person", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ExampleTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ExampleTest.scala
index 51ee45ecb4cac..f170fd82be227 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ExampleTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ExampleTest.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.docgen.refcard
 import org.junit.Ignore
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 @Ignore
 class ExamplesTest extends RefcardTest with QueryStatisticsTestSupport {
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ForeachTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ForeachTest.scala
index 7dac4ba8ee074..27721ae8ccf76 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ForeachTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ForeachTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class ForeachTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person KNOWS B:Person", "B KNOWS C:Person", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/FunctionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/FunctionsTest.scala
index 3e8b961cf5b69..ef3623d8f866f 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/FunctionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/FunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class FunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ImportTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ImportTest.scala
index 3ae3da228cee5..8ab9b6a627ce3 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ImportTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ImportTest.scala
@@ -23,7 +23,7 @@ import java.io.File
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.{CsvFile, RefcardTest}
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class ImportTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List()
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala
index e359af6809acf..0dbc10e7d97d8 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class IndexTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A:Person KNOWS B:Person")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala
index 825e7640cddcf..43ca4ee7cdfa5 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class LabelsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A:Person KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MapsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MapsTest.scala
index d7710032ca2e9..d6f92bfeb1d87 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MapsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MapsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class MapsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A KNOWS B")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MatchTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MatchTest.scala
index 469ee5c30bac6..318b37c5c9a68 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MatchTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MatchTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class MatchTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A:Person", "A KNOWS B:Person", "B KNOWS C:Person", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MathematicalFunctionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MathematicalFunctionsTest.scala
index 5ff5e23c9695c..093f940a5183f 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MathematicalFunctionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MathematicalFunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class MathematicalFunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MergeTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MergeTest.scala
index 95fd69cf8e1da..c0d7523ad2c6b 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MergeTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/MergeTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class MergeTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A:Person KNOWS B:Person")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala
index 8def1eb25b172..7a720b26e3701 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class PathFunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person KNOWS B:Person", "B KNOWS C:Person", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PatternsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PatternsTest.scala
index 379bded42404f..fc31bef9affe9 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PatternsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PatternsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class PatternsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person:Swedish KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PredicatesTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PredicatesTest.scala
index e5b69952bea3c..e13c704924a32 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PredicatesTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PredicatesTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class PredicatesTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RelationshipFunctionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RelationshipFunctionsTest.scala
index 72cb00e2499be..9346c51267af5 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RelationshipFunctionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RelationshipFunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class RelationshipFunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RemoveTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RemoveTest.scala
index bb086d80f400a..6b258f16c9084 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RemoveTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/RemoveTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class RemoveTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A:Person", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ReturnTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ReturnTest.scala
index 80a30d510cb7c..ab68f7c426547 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ReturnTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/ReturnTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class ReturnTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/SetTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/SetTest.scala
index e16fa55ca20e2..ce89176fae878 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/SetTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/SetTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class SetTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StartTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StartTest.scala
index 05bd2d6784c6b..219a0a9d6d47b 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StartTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StartTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class StartTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT LINK A", "A LINK B", "B LINK C", "C LINK ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StringFunctionsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StringFunctionsTest.scala
index 2b8c760c7d247..62a935d242383 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StringFunctionsTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/StringFunctionsTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class StringFunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/UnionTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/UnionTest.scala
index 0f9e1b653bc02..ebbc7dbf85b18 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/UnionTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/UnionTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class UnionTest extends RefcardTest with QueryStatisticsTestSupport {
   def graphDescription = List(
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WhereTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WhereTest.scala
index 703383adc5c06..d0b39b4a2f4d6 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WhereTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WhereTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class WhereTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT FRIEND A", "A FRIEND B", "B FRIEND C", "C FRIEND ROOT")
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WithTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WithTest.scala
index a434141891dd0..e80af1790977e 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WithTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/WithTest.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.docgen.refcard
 
 import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
 
 class WithTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT FRIEND A", "A FRIEND B", "B FRIEND C", "C FRIEND ROOT")
diff --git a/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java b/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
index fe9b35c21a5f4..fa2c12ce26932 100644
--- a/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
+++ b/manual/embedded-examples/src/test/java/org/neo4j/examples/AbstractJavaDocTestBase.java
@@ -66,7 +66,7 @@ public GraphDatabaseService graphdb()
 
     protected String createCypherSnippet( String cypherQuery )
     {
-        String snippet = org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier.apply( cypherQuery );
+        String snippet = org.neo4j.cypher.internal.compiler.v3_1.prettifier.Prettifier.apply( cypherQuery );
         return AsciidocHelper.createAsciiDocSnippet( "cypher", snippet );
     }