diff --git a/examples/pom.xml b/examples/pom.xml
index dedddbe7..a7dfc861 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>json-path-parent</artifactId>
-        <groupId>com.jayway.jsonassert</groupId>
+        <groupId>com.jayway.jsonpath</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <groupId>com.jayway.jsonassert</groupId>
diff --git a/json-path-assert/pom.xml b/json-path-assert/pom.xml
new file mode 100644
index 00000000..4febfadc
--- /dev/null
+++ b/json-path-assert/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>json-path-parent</artifactId>
+        <groupId>com.jayway.jsonpath</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <groupId>com.jayway.jsonpath</groupId>
+    <artifactId>json-path-assert</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>json-path-assert</name>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/json-path/pom.xml b/json-path/pom.xml
index 99c0030b..96952770 100644
--- a/json-path/pom.xml
+++ b/json-path/pom.xml
@@ -18,11 +18,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.jayway.jsonassert</groupId>
+        <groupId>com.jayway.jsonpath</groupId>
         <artifactId>json-path-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <groupId>com.jayway.jsonassert</groupId>
+    <groupId>com.jayway.jsonpath</groupId>
     <artifactId>json-path</artifactId>
     <packaging>jar</packaging>
     <version>1.0-SNAPSHOT</version>
diff --git a/json-path/src/main/java/com/jayway/jsonpath/PathItem.java b/json-path/src/main/java/com/jayway/jsonpath/PathItem.java
index 1a2b71d9..df3b29a6 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/PathItem.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/PathItem.java
@@ -1,8 +1,5 @@
 package com.jayway.jsonpath;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
 /**
  * Created by IntelliJ IDEA.
  * User: kallestenflo
diff --git a/json-path/src/main/java/com/jayway/jsonpath/filter/JsonPathFilterBase.java b/json-path/src/main/java/com/jayway/jsonpath/filter/JsonPathFilterBase.java
index e85de518..9d25456d 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/filter/JsonPathFilterBase.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/filter/JsonPathFilterBase.java
@@ -1,10 +1,5 @@
 package com.jayway.jsonpath.filter;
 
-import com.jayway.jsonpath.PathItem;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.Collection;
 import java.util.List;
 
 /**
diff --git a/json-path/src/test/java/com/jayway/jsonpath/SplitPathFragmentsTest.java b/json-path/src/test/java/com/jayway/jsonpath/SplitPathFragmentsTest.java
index 88804d7c..e0270ba4 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/SplitPathFragmentsTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/SplitPathFragmentsTest.java
@@ -1,6 +1,5 @@
 package com.jayway.jsonpath;
 
-import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.hasItemInArray;
diff --git a/pom.xml b/pom.xml
index 82925c5c..f44cf5d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,14 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>5</version>
     </parent>
-    <groupId>com.jayway.jsonassert</groupId>
+    <groupId>com.jayway.jsonpath</groupId>
     <artifactId>json-path-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
@@ -73,7 +71,8 @@
     <modules>
         <module>json-path</module>
         <module>examples</module>
-    </modules>
+    <module>json-path-assert</module>
+  </modules>
 
     <build>
         <pluginManagement>