diff --git a/pom.xml b/pom.xml
index eb9d4d6bf..f65a22f6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.data</groupId>
@@ -7,7 +8,9 @@
     <version>4.2.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Spring Data Neo4j - Parent</name>
+    <name>Spring Data Neo4j</name>
+    <description>Neo4j support for Spring Data</description>
+    <url>http://projects.spring.io/spring-data-neo4j</url>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
@@ -16,18 +19,15 @@
     </parent>
 
     <modules>
-
         <module>spring-data-neo4j</module>
         <module>spring-data-neo4j-distribution</module>
-
     </modules>
 
     <properties>
         <project.type>multi</project.type>
+        <dist.id>spring-data-neo4j</dist.id>
         <springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
         <source.level>1.7</source.level>
-        <commonslang.version>2.6</commonslang.version>
-        <bundlor.enabled>false</bundlor.enabled>
     </properties>
 
     <developers>
@@ -78,11 +78,25 @@
         <developer>
             <id>mangrish</id>
             <name>Mark Angrish</name>
+            <email>mark at graphaware.com</email>
+            <organization>GraphAware</organization>
+            <organizationUrl>http://www.graphaware.com</organizationUrl>
             <roles>
                 <role>Developer</role>
             </roles>
             <timezone>+11</timezone>
         </developer>
+        <developer>
+            <id>jasperblues</id>
+            <name>Jasper Blues</name>
+            <email>jasper at graphaware.com</email>
+            <organization>GraphAware</organization>
+            <organizationUrl>http://www.graphaware.com</organizationUrl>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>+8</timezone>
+        </developer>
         <developer>
             <id>mhunger</id>
             <name>Michael Hunger</name>
@@ -147,27 +161,26 @@
                 <scope>test</scope>
             </dependency>
 
-       </dependencies>
+        </dependencies>
 
     </dependencyManagement>
 
     <profiles>
-		<profile>
-			<id>release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jfrog.buildinfo</groupId>
-						<artifactId>artifactory-maven-plugin</artifactId>
-						<inherited>false</inherited>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jfrog.buildinfo</groupId>
+                        <artifactId>artifactory-maven-plugin</artifactId>
+                        <inherited>false</inherited>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <repositories>
-
         <repository>
             <id>neo4j</id>
             <url>http://m2.neo4j.org/content/repositories/releases</url>
@@ -176,7 +189,6 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
-
         <repository>
             <id>neo4j-snapshots</id>
             <url>http://m2.neo4j.org/content/repositories/snapshots</url>
@@ -185,19 +197,16 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
-
         <repository>
             <id>spring-libs-snapshot</id>
-            <name>Spring</name>
             <url>https://repo.spring.io/libs-snapshot</url>
         </repository>
-
     </repositories>
 
     <pluginRepositories>
         <pluginRepository>
             <id>spring-plugins-release</id>
-            <url>http://repo.spring.io/plugins-release</url>
+            <url>https://repo.spring.io/plugins-release</url>
         </pluginRepository>
     </pluginRepositories>
 
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index f44a9393b..bcac40b96 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -13,8 +13,14 @@
   -->
 
 <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/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
+    <artifactId>spring-data-neo4j</artifactId>
+
+    <name>Spring Data Neo4J - Core</name>
+    <description>Neo4J support for Spring Data</description>
+
     <parent>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-parent</artifactId>
@@ -22,113 +28,130 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>spring-data-neo4j</artifactId>
-
     <properties>
         <neo4j.ogm.version>2.1.0</neo4j.ogm.version>
         <ogm.properties>ogm-http.properties</ogm.properties>
     </properties>
 
-    <name>Spring Data Neo4j</name>
 
-        <dependencies>
+    <dependencies>
 
-            <dependency>
-                <groupId>org.neo4j</groupId>
-                <artifactId>neo4j-ogm-core</artifactId>
-                <version>${neo4j.ogm.version}</version>
-            </dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
 
+        <!-- Spring Data -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${springdata.commons}</version>
+        </dependency>
 
-            <dependency>
-                <groupId>org.neo4j</groupId>
-                <artifactId>neo4j-ogm-http-driver</artifactId>
-                <version>${neo4j.ogm.version}</version>
-            </dependency>
+        <!-- CDI -->
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>${cdi}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
 
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>el-api</artifactId>
+            <version>${cdi}</version>
+            <scope>test</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-commons</artifactId>
-                <version>${springdata.commons}</version>
-            </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-            </dependency>
+        <dependency>
+            <groupId>org.apache.openwebbeans.test</groupId>
+            <artifactId>cditest-owb</artifactId>
+            <version>${webbeans}</version>
+            <scope>test</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-tx</artifactId>
-            </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
+        <!-- JSR 303 Validation -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation}</version>
+            <optional>true</optional>
+        </dependency>
 
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+            <scope>test</scope>
+        </dependency>
 
-            <!-- test-scoped jars -->
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-webmvc</artifactId>
-                <scope>test</scope>
-            </dependency>
+        <!-- Neo4j OGM -->
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-core</artifactId>
+            <version>${neo4j.ogm.version}</version>
+        </dependency>
 
-            <!-- this test dependency also brings in all the drivers -->
-            <dependency>
-                <groupId>org.neo4j</groupId>
-                <artifactId>neo4j-ogm-test</artifactId>
-                <version>${neo4j.ogm.version}</version>
-                <scope>test</scope>
-            </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-http-driver</artifactId>
+            <version>${neo4j.ogm.version}</version>
+        </dependency>
 
-            <!-- jsr 303 tests -->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <scope>test</scope>
-            </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-test</artifactId>
+            <version>${neo4j.ogm.version}</version>
+            <scope>test</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>javax.el</artifactId>
-                <scope>test</scope>
-            </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-            <dependency>
-                <groupId>javax.el</groupId>
-                <artifactId>el-api</artifactId>
-                <version>${cdi}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- CDI -->
-            <dependency>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
-                <version>${cdi}</version>
-                <scope>provided</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.openwebbeans.test</groupId>
-                <artifactId>cditest-owb</artifactId>
-                <version>${webbeans}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
+    </dependencies>
 
     <build>
         <plugins>
@@ -157,20 +180,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
new file mode 100644
index 000000000..9e1c6e142
--- /dev/null
+++ b/spring-data-neo4j/template.mf
@@ -0,0 +1,19 @@
+Bundle-SymbolicName: org.springframework.data.neo4j
+Bundle-Name: Spring Data Neo4J Support
+Bundle-Vendor: Pivotal Software, Inc; Neo Technology, Inc; Graph Aware Ltd.
+Bundle-ManifestVersion: 2
+Bundle-Version: ${project.version}
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package:
+ sun.reflect;version="0";resolution:=optional
+Export-Template:
+ org.springframework.data.neo4j.*;version="${project.version}"
+Import-Template:
+ javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.neo4j.ogm.*;resolution:=optional,
+ javax.servlet.*;version="0",
+ org.apache.commons.*;version="0",
+ org.springframework.*;version="${spring:[=.=.=.=,+1.1.0)}",
+ org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
+ org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
+ org.w3c.*;version="0"