diff --git a/cv-mapping-rules/pom.xml b/cv-mapping-rules/pom.xml
deleted file mode 100644
index a3cffbd..0000000
--- a/cv-mapping-rules/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-
-    <groupId>psidev.psi.tools</groupId>
-    <artifactId>psi-tools-build</artifactId>
-    <packaging>pom</packaging>
-    <version>2</version>
-    <name>PSI :: Tools</name>
-    <url>http://www.psidev.info</url>
-    <description>Base build file</description>
-
-    <scm>
-        <connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/current</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/current</developerConnection>
-        <url>http://svn.code.sf.net/p/psidev/svn/psi/tools/current/</url>
-    </scm>
-
-    <modules>
-        <module>cv-rule-reader</module>
-        <module>ontology-manager</module>
-        <module>validator</module>
-        <module>xxindex</module>
-        <module>master-pom</module>
-        <module>ontology-config-reader</module>
-        <module>object-rule-reader</module>
-    </modules>
-
-    <distributionManagement>
-        <repository>
-            <id>ebi-repo</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo</url>
-        </repository>
-
-        <snapshotRepository>
-            <id>ebi-repo-snapshots</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-</project>
diff --git a/cv-rule-reader/pom.xml b/cv-rule-reader/pom.xml
index 840205b..23ef633 100644
--- a/cv-rule-reader/pom.xml
+++ b/cv-rule-reader/pom.xml
@@ -1,30 +1,21 @@
-<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>psidev.psi.tools</groupId>
         <artifactId>master-pom</artifactId>
-        <version>4</version>
+        <version>2.0.7</version>
     </parent>
 
-    <groupId>psidev.psi.tools</groupId>
     <artifactId>cv-rule-reader</artifactId>
+    <name>PSI :: Tools :: CV Rule Reader</name>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
 
-    <name>PSI :: Tools :: CV Rule Reader</name>
 
     <description>
         The library provides a cv rule reader for the cv rule configuration XML file that is used with the validator.
     </description>
 
-    <scm>
-        <connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</developerConnection>
-        <url>http://svn.code.sf.net/p/psidev/svn/psi/tools/cv-rule-reader/trunk</url>
-    </scm>
-
     <build>
         <plugins>
             <!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
@@ -45,57 +36,35 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- Assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>${descriptor}</descriptor>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- 3rd party -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
         </dependency>
 
         <!-- JAXB related deps -->
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.1.3</version>
         </dependency>
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax</artifactId>
-            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+        </dependency>
+
+        <!-- Tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-    
 </project>
diff --git a/object-rule-reader/pom.xml b/object-rule-reader/pom.xml
index d77b1d0..923ddce 100644
--- a/object-rule-reader/pom.xml
+++ b/object-rule-reader/pom.xml
@@ -1,30 +1,21 @@
-<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>psidev.psi.tools</groupId>
         <artifactId>master-pom</artifactId>
-        <version>4</version>
+        <version>2.0.7</version>
     </parent>
 
-    <groupId>psidev.psi.tools</groupId>
     <artifactId>object-rule-reader</artifactId>
+    <name>PSI :: Tools :: Object Rule Reader</name>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
 
-    <name>PSI :: Tools :: Object Rule Reader</name>
 
     <description>
         The library provides an object rule configuration reader.
     </description>
 
-    <scm>
-        <connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</developerConnection>
-        <url>https://svn.code.sf.net/p/psidev/svn/psi/tools/object-rule-reader/trunk</url>
-    </scm>
-
     <build>
         <plugins>
             <!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
@@ -32,13 +23,6 @@
                 <groupId>com.sun.tools.xjc.maven2</groupId>
                 <artifactId>maven-jaxb-plugin</artifactId>
                 <version>1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <generatePackage>psidev.psi.tools.objectRuleReader.mapping.jaxb</generatePackage>
                     <includeSchemas>
@@ -47,58 +31,43 @@
                     <strict>true</strict>
                     <verbose>true</verbose>
                 </configuration>
-            </plugin>
-
-            <!-- Assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>${descriptor}</descriptor>
-                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- 3rd party -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
         </dependency>
 
         <!-- JAXB related deps -->
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.1.3</version>
         </dependency>
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax</artifactId>
-            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+        </dependency>
+
+        <!-- Tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-    
 </project>
diff --git a/ontology-config-reader/pom.xml b/ontology-config-reader/pom.xml
index 9416347..e84d3de 100644
--- a/ontology-config-reader/pom.xml
+++ b/ontology-config-reader/pom.xml
@@ -1,30 +1,21 @@
-<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>psidev.psi.tools</groupId>
         <artifactId>master-pom</artifactId>
-        <version>4</version>
+        <version>2.0.7</version>
     </parent>
 
-    <groupId>psidev.psi.tools</groupId>
     <artifactId>ontology-config-reader</artifactId>
+    <name>PSI :: Tools :: Ontology Config Reader</name>
     <packaging>jar</packaging>
-    <version>2.0.6-SNAPSHOT</version>
 
-    <name>PSI :: Tools :: Ontology Config Reader</name>
 
     <description>
         The library provides an ontology configuration reader.
     </description>
 
-    <scm>
-        <connection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</developerConnection>
-        <url>https://svn.code.sf.net/p/psidev/svn/psi/tools/ontology-config-reader/trunk</url>
-    </scm>
-
     <build>
         <plugins>
             <!-- Conversion of XML Schema into Java source code using JAXB-XJC -->
@@ -32,13 +23,6 @@
                 <groupId>com.sun.tools.xjc.maven2</groupId>
                 <artifactId>maven-jaxb-plugin</artifactId>
                 <version>1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <generatePackage>psidev.psi.tools.ontologyCfgReader.mapping.jaxb</generatePackage>
                     <includeSchemas>
@@ -47,58 +31,43 @@
                     <strict>true</strict>
                     <verbose>true</verbose>
                 </configuration>
-            </plugin>
-
-            <!-- Assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>${descriptor}</descriptor>
-                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- 3rd party -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
         </dependency>
 
         <!-- JAXB related deps -->
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.1.3</version>
         </dependency>
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax</artifactId>
-            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+        </dependency>
+
+        <!-- Tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-    
 </project>
diff --git a/ontology-manager/pom.xml b/ontology-manager/pom.xml
index ba39e30..7537e4c 100644
--- a/ontology-manager/pom.xml
+++ b/ontology-manager/pom.xml
@@ -1,55 +1,25 @@
 <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>
+
     <parent>
         <groupId>psidev.psi.tools</groupId>
         <artifactId>master-pom</artifactId>
-        <version>4</version>
+        <version>2.0.7</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>ontology-manager</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
-    <packaging>jar</packaging>
     <name>PSI :: Tools :: Ontology Manager</name>
+    <packaging>jar</packaging>
 
     <description>
         The library intends to provide a generic framework for Ontology access and handling.
     </description>
 
-    <scm>
-        <connection>scm:git:https://github.com/MICommunity/ontology-manager.git</connection>
-        <developerConnection>scm:git:https://github.com/MICommunity/ontology-manager.git</developerConnection>
-        <url>https://github.com/MICommunity/ontology-manager</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <remoteTagging>true</remoteTagging>
-                    <goals>deploy</goals>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
     <dependencies>
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>ontology-config-reader</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- OBO parser -->
@@ -86,11 +56,6 @@
             <artifactId>commons-discovery</artifactId>
             <version>0.2</version>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-        </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
@@ -104,6 +69,11 @@
         </dependency>
 
         <!-- 3rd party -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -122,50 +92,18 @@
             <version>2.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- caching -->
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>oscache</artifactId>
             <version>2.3</version>
         </dependency>
-    </dependencies>
 
-    <repositories>
-        <repository>
-            <id>nexus-ebi-repo-old</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/</url>
-        </repository>
-        <repository>
-            <id>nexus-ebi-release-repo</id>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/</url>
-        </repository>
-        <repository>
-            <id>nexus-ebi-snapshot-repo</id>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-snapshots/</url>
-        </repository>
-    </repositories>
+        <!-- Tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
 
-    <!-- Overwrites the previous repositories-->
-    <distributionManagement>
-        <!-- EBI repo -->
-        <repository>
-            <id>pst-release</id>
-            <name>EBI Nexus Repository</name>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-release</url>
-        </repository>
-        <!-- EBI SNAPSHOT repo -->
-        <snapshotRepository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>pst-snapshots</id>
-            <name>EBI Nexus Snapshots Repository</name>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>
\ No newline at end of file
diff --git a/ontology-manager/src/test/java/psidev/psi/tools/ontology_manager/impl/ols/OlsOntologyTest.java b/ontology-manager/src/test/java/psidev/psi/tools/ontology_manager/impl/ols/OlsOntologyTest.java
index f47621e..dfe6413 100644
--- a/ontology-manager/src/test/java/psidev/psi/tools/ontology_manager/impl/ols/OlsOntologyTest.java
+++ b/ontology-manager/src/test/java/psidev/psi/tools/ontology_manager/impl/ols/OlsOntologyTest.java
@@ -1,7 +1,6 @@
 package psidev.psi.tools.ontology_manager.impl.ols;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import psidev.psi.tools.ontology_manager.OntologyManager;
 import psidev.psi.tools.ontology_manager.OntologyUtils;
@@ -62,10 +61,10 @@ public void getValidTerms() throws OntologyLoaderException {
     public void getValidTerms_so() throws OntologyLoaderException {
         final OntologyAccess mod = manager.getOntologyAccess( "SO" );
 //        OntologyTermI parent = mod.getTermForAccession("SO:0000001"); // no good for testing!
-        // SO:0000336 has 9 children (OLS 10 Aug 2011) = 9 valid terms
+        // SO:0000336 has 9 children (OLS 27 Jul 2016) = 28 valid terms
         OntologyTermI parent = mod.getTermForAccession("SO:0000336");
         Set<OntologyTermI> terms = mod.getAllChildren(parent);
-        Assert.assertEquals( 14, terms.size() );
+        Assert.assertEquals( 28, terms.size() );
     }
 
     @Test
@@ -87,16 +86,16 @@ public void getMiTermSynonyms() throws OntologyLoaderException {
         Assert.assertTrue( y2h.getNameSynonyms().contains( "2H" ) );
 
     }
-    
+
     @Test
     public void getMiTermSynonyms0217() throws OntologyLoaderException {
         final OntologyAccess mi = manager.getOntologyAccess( "MI" );
         final Set<OntologyTermI> terms = mi.getValidTerms( "MI:0217", false, true );
         Assert.assertEquals( 1, terms.size() );
-        
+
         final OntologyTermI phosphorylation = mi.getTermForAccession("MI:0217");
         assertEquals(1, phosphorylation.getNameSynonyms().size());
-        
+
         // different approach
         Collection<String> names;
         names = OntologyUtils.getTermNames(terms);
@@ -109,17 +108,17 @@ public void getMiChildTermSynonyms0190() throws OntologyLoaderException {
         OntologyAccess mi = manager.getOntologyAccess( "MI" );
         Set<OntologyTermI> terms = mi.getValidTerms( "MI:0190", true, false );
         Assert.assertFalse(terms.isEmpty());
-        
+
         // different approach
         Collection<String> names;
         names = OntologyUtils.getTermNames(terms);
         // preferred name
         assertTrue(names.contains("phosphorylation reaction"));
-        
+
         // how about synonym?
         assertTrue(names.contains("phosphorylation"));
     }
-    
+
     @Test
     public void getModTermSynonyms() throws OntologyLoaderException {
         final OntologyAccess mod = manager.getOntologyAccess( "MOD" );
diff --git a/master-pom/pom.xml b/pom.xml
similarity index 54%
rename from master-pom/pom.xml
rename to pom.xml
index 137b3d0..6035ef5 100755
--- a/master-pom/pom.xml
+++ b/pom.xml
@@ -1,19 +1,12 @@
-<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>psidev.psi.tools</groupId>
     <artifactId>master-pom</artifactId>
     <packaging>pom</packaging>
-    <version>5-SNAPSHOT</version>
- 
-    <name>master-pom</name>
+    <version>2.0.7</version>
 
-    <scm>
-        <connection>scm:svn:https://psidev.svn.sourceforge.net/svnroot/psidev/psi/tools/master-pom/trunk</connection>
-        <developerConnection>scm:svn:https://psidev.svn.sourceforge.net/svnroot/psidev/psi/tools/master-pom/trunk</developerConnection>
-        <url>https://psidev.svn.sourceforge.net/svnroot/psidev/psi/tools/master-pom/trunk</url>
-    </scm>
+    <name>PSI :: Tools :: Master pom</name>
 
     <developers>
         <developer>
@@ -50,6 +43,22 @@
         </developer>
     </developers>
 
+
+    <scm>
+        <connection>scm:git:https://github.com/MICommunity/psi-tools.git</connection>
+        <developerConnection>scm:git:https://github.com/MICommunity/psi-tools.git</developerConnection>
+        <url>https://github.com/MICommunity/psi-tools.git</url>
+    </scm>
+
+    <modules>
+        <module>cv-rule-reader</module>
+        <module>ontology-manager</module>
+        <module>validator</module>
+        <module>ontology-config-reader</module>
+        <module>object-rule-reader</module>
+    </modules>
+
+
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -63,21 +72,35 @@
         <url>http://www.ebi.ac.uk/</url>
     </organization>
 
+    <profiles>
+        <profile>
+            <id>disable-java8-doclint</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <additionalparam>-Xdoclint:none</additionalparam>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <defaultGoal>clean install</defaultGoal>
-
         <plugins>
             <!-- To compile with JDK5.0 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-source</id>
@@ -87,12 +110,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>external.atlassian.jgitflow</groupId>
+                <artifactId>jgitflow-maven-plugin</artifactId>
+                <version>1.0-m5.1</version>
+                <configuration>
+                    <flowInitContext>
+                        <masterBranchName>master</masterBranchName>
+                        <developBranchName>develop</developBranchName>
+                        <featureBranchPrefix>feature-</featureBranchPrefix>
+                        <releaseBranchPrefix>release-</releaseBranchPrefix>
+                        <hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
+                        <versionTagPrefix>${project.artifactId}-</versionTagPrefix>
+                    </flowInitContext>
+                    <!-- see goals wiki page for configuration options -->
+                </configuration>
+            </plugin>
         </plugins>
 
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.3</version>
                     <configuration>
                         <source>1.5</source>
                         <aggregate>true</aggregate>
@@ -101,6 +142,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
                     <configuration>
                         <goals>deploy</goals>
                     </configuration>
@@ -114,9 +156,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.5</version>
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
@@ -144,40 +188,75 @@
         </plugins>
     </reporting>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <!-- 3rd party -->
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.3</version>
+            </dependency>
+
+            <!-- JAXB related deps -->
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>stax</groupId>
+                <artifactId>stax</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+            </dependency>
+
+            <!-- Test -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.3.1</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-        <repositories>
+    <repositories>
         <repository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
+            <id>nexus-ebi-repo-old</id>
+            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/</url>
+        </repository>
+        <repository>
+            <id>nexus-ebi-release-repo</id>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/</url>
+        </repository>
+        <repository>
+            <id>nexus-ebi-snapshot-repo</id>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-snapshots/</url>
         </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>intact.nexus</id>
-            <name>IntAct Nexus</name>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <distributionManagement>
+        <!-- EBI repo -->
         <repository>
-            <id>ebi-repo</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo</url>
+            <id>pst-release</id>
+            <name>EBI Nexus Repository</name>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-release</url>
         </repository>
-
+        <!-- EBI SNAPSHOT repo -->
         <snapshotRepository>
-            <id>ebi-repo-snapshots</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo-snapshots</url>
+            <uniqueVersion>false</uniqueVersion>
+            <id>pst-snapshots</id>
+            <name>EBI Nexus Snapshots Repository</name>
+            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
diff --git a/validator-tutorial/pom.xml b/validator-tutorial/pom.xml
index 4d25470..ff64340 100644
--- a/validator-tutorial/pom.xml
+++ b/validator-tutorial/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
+<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">
 
diff --git a/validator/pom.xml b/validator/pom.xml
index 0010e72..cd419f0 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -1,130 +1,59 @@
-<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>psidev.psi.tools</groupId>
         <artifactId>master-pom</artifactId>
-        <version>4</version>
+        <version>2.0.7</version>
     </parent>
 
     <artifactId>validator</artifactId>
+    <name>PSI :: Tools :: Generic Schema Validator</name>
     <packaging>jar</packaging>
-    <version>2.0.6</version>
 
-    <name>PSI :: Tools :: Generic Schema Validator</name>
     <description>
-        The library intends to provide a generic framework for validating XML Schema both at the syntactic and semantic level.
+        The library intends to provide a generic framework for validating XML Schema both at the syntactic and semantic
+        level.
     </description>
 
-    <scm>
-        <connection>scm:git:https://github.com/MICommunity/psi-validator.git</connection>
-        <developerConnection>scm:git:https://github.com/MICommunity/psi-validator.git</developerConnection>
-        <url>https://github.com/MICommunity/psi-validator</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>external.atlassian.jgitflow</groupId>
-                <artifactId>jgitflow-maven-plugin</artifactId>
-                <version>1.0-m5.1</version>
-                <configuration>
-                        <flowInitContext>
-                            <masterBranchName>master</masterBranchName>
-                            <developBranchName>develop</developBranchName>
-                            <featureBranchPrefix>feature-</featureBranchPrefix>
-                            <releaseBranchPrefix>release-</releaseBranchPrefix>
-                            <hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
-                            <versionTagPrefix>${project.artifactId}-</versionTagPrefix>
-                        </flowInitContext>
-                    <!-- see goals wiki page for configuration options -->
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>cv-rule-reader</artifactId>
-            <version>2.0.5</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>object-rule-reader</artifactId>
-            <version>2.0.5</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>psidev.psi.tools</groupId>
             <artifactId>ontology-manager</artifactId>
-            <version>2.0.6</version>
-        </dependency>
-
-        <!-- Tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- 3rd party -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            </dependency>
-            <dependency>
+        </dependency>
+        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>commons-jxpath</groupId>
             <artifactId>commons-jxpath</artifactId>
             <version>1.2</version>
         </dependency>
+        <!-- Tests -->
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>nexus-ebi-repo-old</id>
-            <url>http://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/</url>
-        </repository>
-        <repository>
-            <id>nexus-ebi-release-repo</id>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/</url>
-        </repository>
-        <repository>
-            <id>nexus-ebi-snapshot-repo</id>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-snapshots/</url>
-        </repository>
-    </repositories>
-
-    <!-- Overwrites the previous repositories-->
-    <distributionManagement>
-        <!-- EBI repo -->
-        <repository>
-            <id>pst-release</id>
-            <name>EBI Nexus Repository</name>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-release</url>
-        </repository>
-        <!-- EBI SNAPSHOT repo -->
-        <snapshotRepository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>pst-snapshots</id>
-            <name>EBI Nexus Snapshots Repository</name>
-            <url>http://www.ebi.ac.uk/Tools/maven/repos/content/repositories/pst-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-    
 </project>
diff --git a/cv-mapping-rules/xsl/cv-mapping/CvMappingRules.xsl b/xml-schemas/xsl/cv-mapping/CvMappingRules.xsl
similarity index 100%
rename from cv-mapping-rules/xsl/cv-mapping/CvMappingRules.xsl
rename to xml-schemas/xsl/cv-mapping/CvMappingRules.xsl