From 1eb47a23d79732f63d8e0869b40d263362a79038 Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Sun, 22 Nov 2015 12:01:10 +0100
Subject: [PATCH] Renamed token package to path.

---
 .../src/main/java/com/jayway/jsonpath/JsonPath.java      | 2 +-
 .../com/jayway/jsonpath/internal/filter/ValueNode.java   | 4 ++--
 .../internal/{token => path}/ArrayIndexOperation.java    | 2 +-
 .../internal/{token => path}/ArrayPathToken.java         | 2 +-
 .../internal/{token => path}/ArraySliceOperation.java    | 2 +-
 .../jsonpath/internal/{ => path}/CompiledPath.java       | 8 +++++---
 .../internal/{token => path}/EvaluationContextImpl.java  | 2 +-
 .../internal/{token => path}/FunctionPathToken.java      | 2 +-
 .../jsonpath/internal/{ => path}/PathCompiler.java       | 9 +++------
 .../jsonpath/internal/{token => path}/PathToken.java     | 2 +-
 .../internal/{token => path}/PathTokenAppender.java      | 2 +-
 .../internal/{token => path}/PathTokenFactory.java       | 2 +-
 .../internal/{token => path}/PredicateContextImpl.java   | 2 +-
 .../internal/{token => path}/PredicatePathToken.java     | 2 +-
 .../internal/{token => path}/PropertyPathToken.java      | 2 +-
 .../jsonpath/internal/{token => path}/RootPathToken.java | 2 +-
 .../jsonpath/internal/{token => path}/ScanPathToken.java | 2 +-
 .../internal/{token => path}/WildcardPathToken.java      | 2 +-
 .../src/test/java/com/jayway/jsonpath/BaseTest.java      | 2 +-
 .../test/java/com/jayway/jsonpath/PathCompilerTest.java  | 2 +-
 .../jsonpath/internal/{token => path}/PathTokenTest.java | 2 +-
 .../test/java/com/jayway/jsonpath/old/JsonPathTest.java  | 2 +-
 .../jayway/jsonpath/old/internal/ScanPathTokenTest.java  | 2 +-
 .../com/jayway/jsonpath/old/internal/TestInternal3.java  | 2 +-
 24 files changed, 31 insertions(+), 32 deletions(-)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/ArrayIndexOperation.java (97%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/ArrayPathToken.java (99%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/ArraySliceOperation.java (98%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{ => path}/CompiledPath.java (89%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/EvaluationContextImpl.java (99%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/FunctionPathToken.java (97%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{ => path}/PathCompiler.java (97%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PathToken.java (99%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PathTokenAppender.java (68%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PathTokenFactory.java (97%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PredicateContextImpl.java (98%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PredicatePathToken.java (98%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/PropertyPathToken.java (98%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/RootPathToken.java (97%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/ScanPathToken.java (99%)
 rename json-path/src/main/java/com/jayway/jsonpath/internal/{token => path}/WildcardPathToken.java (97%)
 rename json-path/src/test/java/com/jayway/jsonpath/internal/{token => path}/PathTokenTest.java (97%)

diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
index 732909f2..8ce853d5 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
@@ -18,9 +18,9 @@ package com.jayway.jsonpath;
 import com.jayway.jsonpath.internal.EvaluationContext;
 import com.jayway.jsonpath.internal.JsonContext;
 import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.Utils;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.io.File;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
index 0985dbfd..1b0c099f 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
@@ -7,9 +7,9 @@ import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.Utils;
-import com.jayway.jsonpath.internal.token.PredicateContextImpl;
+import com.jayway.jsonpath.internal.path.PathCompiler;
+import com.jayway.jsonpath.internal.path.PredicateContextImpl;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
index 0a54c09d..0fd833a0 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.internal.Utils;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayPathToken.java
similarity index 99%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayPathToken.java
index 8236bc9d..05d29d76 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayPathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.PathNotFoundException;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArraySliceOperation.java
similarity index 98%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/ArraySliceOperation.java
index f21f6f83..e6dcb8c1 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ArraySliceOperation.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.InvalidPathException;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
similarity index 89%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
index e2c074c7..018a8b5e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
@@ -12,11 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.internal.token.EvaluationContextImpl;
-import com.jayway.jsonpath.internal.token.RootPathToken;
+import com.jayway.jsonpath.internal.EvaluationAbortException;
+import com.jayway.jsonpath.internal.EvaluationContext;
+import com.jayway.jsonpath.internal.Path;
+import com.jayway.jsonpath.internal.PathRef;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
similarity index 99%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
index e1978813..804d1e96 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.EvaluationListener;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
index 1c56f07c..beef14db 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.function.PathFunction;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
index 9a9fcb75..e4fcd311 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
@@ -1,13 +1,10 @@
-package com.jayway.jsonpath.internal;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.Predicate;
+import com.jayway.jsonpath.internal.CharacterIndex;
+import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.filter.FilterCompiler;
-import com.jayway.jsonpath.internal.token.ArrayIndexOperation;
-import com.jayway.jsonpath.internal.token.ArraySliceOperation;
-import com.jayway.jsonpath.internal.token.PathTokenAppender;
-import com.jayway.jsonpath.internal.token.PathTokenFactory;
-import com.jayway.jsonpath.internal.token.RootPathToken;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
similarity index 99%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
index fcd9c258..d6300c40 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenAppender.java
similarity index 68%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenAppender.java
index a7be89d1..c5b7a68e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenAppender.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 public interface PathTokenAppender {
     PathTokenAppender appendPathToken(PathToken next);
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenFactory.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenFactory.java
index b363fcb0..fa11c45a 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenFactory.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Predicate;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicateContextImpl.java
similarity index 98%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicateContextImpl.java
index 3abc68d5..d471b6ce 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicateContextImpl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.Predicate;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicatePathToken.java
similarity index 98%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicatePathToken.java
index 4a27e51e..b50b848c 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicatePathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.InvalidPathException;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PropertyPathToken.java
similarity index 98%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/PropertyPathToken.java
index d4633a67..044fc1cf 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PropertyPathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.PathNotFoundException;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
index 60f204ef..2b2db7b1 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.internal.PathRef;
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
similarity index 99%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
index 07d48ad2..4d9f4dea 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.internal.PathRef;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/WildcardPathToken.java
similarity index 97%
rename from json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java
rename to json-path/src/main/java/com/jayway/jsonpath/internal/path/WildcardPathToken.java
index 1ce86ddc..37d02ec9 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/WildcardPathToken.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java b/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
index 38b17557..7aec601b 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
@@ -1,7 +1,7 @@
 package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.token.PredicateContextImpl;
+import com.jayway.jsonpath.internal.path.PredicateContextImpl;
 import com.jayway.jsonpath.spi.json.GsonJsonProvider;
 import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java b/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
index bb55f09b..6c11e970 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 
 import java.util.List;
 
-import static com.jayway.jsonpath.internal.PathCompiler.compile;
+import static com.jayway.jsonpath.internal.path.PathCompiler.compile;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class PathCompilerTest {
diff --git a/json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java b/json-path/src/test/java/com/jayway/jsonpath/internal/path/PathTokenTest.java
similarity index 97%
rename from json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java
rename to json-path/src/test/java/com/jayway/jsonpath/internal/path/PathTokenTest.java
index 7c572572..2ecb1d4a 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/internal/path/PathTokenTest.java
@@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;
 
 import com.jayway.jsonpath.BaseTest;
 import org.junit.Test;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
index e0b919fe..60304267 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
@@ -6,7 +6,7 @@ import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
-import com.jayway.jsonpath.internal.PathCompiler;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java b/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
index ca288dff..9c118391 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
@@ -1,7 +1,7 @@
 package com.jayway.jsonpath.old.internal;
 
 import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.internal.PathCompiler;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java b/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
index 8a075095..5038906e 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import java.util.List;
 import java.util.Map;
 
-import static com.jayway.jsonpath.internal.PathCompiler.compile;
+import static com.jayway.jsonpath.internal.path.PathCompiler.compile;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**