diff --git a/fr.inria.diverse.cloning.benchmark.common/pom.xml~ b/fr.inria.diverse.cloning.benchmark.common/pom.xml~
deleted file mode 100644
index cee1da2df7fdc099b3d90ddfb96552dbe0ab6156..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.common/pom.xml~
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning</groupId>
-  <artifactId>fr.inria.diverse.cloning.runtime</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-</project>
diff --git a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~ b/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~
deleted file mode 100644
index 041034428d798d28f78d9ea9572fc54f54e6f781..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.materialgenerator.product/pom.xml~
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning.benchmark</groupId>
-  <artifactId>fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-repository</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-   <build>
-    <plugins>
-
-      <plugin>
-      <groupId>org.eclipse.tycho</groupId>
-         <artifactId>tycho-p2-director-plugin</artifactId>
-         <version>${tycho.version}</version>
-         <executions>
-            <execution>
-               <id>create-product-distributions</id>
-               <goals>
-                  <goal>materialize-products</goal>
-                  <goal>archive-products</goal>
-               </goals>
-            </execution>
-         </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-  
-</project>
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~
deleted file mode 100644
index e38f4fe55f8d4262cdfeeabde674faca06d3305b..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product/pom.xml~
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning</groupId>
-  <artifactId>fr.inria.diverse.cloning.benchmark.metamodelsgenerator.product</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-repository</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-   <build>
-    <plugins>
-
-      <plugin>
-      <groupId>org.eclipse.tycho</groupId>
-         <artifactId>tycho-p2-director-plugin</artifactId>
-         <version>${tycho.version}</version>
-         <executions>
-            <execution>
-               <id>create-product-distributions</id>
-               <goals>
-                  <goal>materialize-products</goal>
-                  <goal>archive-products</goal>
-               </goals>
-            </execution>
-         </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-  
-</project>
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/ivy.xml b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/ivy.xml
deleted file mode 100644
index 4b9dbdc1c0a5197cf768495c486719e51133d32c..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/ivy.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, 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.    
--->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
-    <info
-        organisation="fr.inria.diverse"
-        module="cloning.benchmark.metamodelsgenerator"
-        status="integration">
-	</info>
-	
-	
-	<dependencies>
-		<dependency org="net.sf.jopt-simple" name="jopt-simple" rev="4.6" />
-	</dependencies>
-	
-	
-</ivy-module>
diff --git a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~ b/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~
deleted file mode 100644
index b5b3aef760aaec211b53e4012732d63fdcc423e0..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.benchmark.metamodelsgenerator/pom.xml~
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning</groupId>
-  <artifactId>fr.inria.diverse.cloning.benchmark.metamodelsgenerator</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-</project>
diff --git a/fr.inria.diverse.cloning.external-libs/.classpath b/fr.inria.diverse.cloning.external-libs/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..b82631f18605a1856d5f427c23855aef057518f8
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jopt-simple-4.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.6.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-jdk14-1.6.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/zt-zip-1.7.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/fr.inria.diverse.cloning.external-libs/.gitignore b/fr.inria.diverse.cloning.external-libs/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5e56e040ec0902e58df8573adaec65c5da6e9304
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/fr.inria.diverse.cloning.external-libs/.project b/fr.inria.diverse.cloning.external-libs/.project
new file mode 100644
index 0000000000000000000000000000000000000000..40be714cc430de7a3a061cd8a207b053e7c8ad31
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fr.inria.diverse.cloning.external-libs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/fr.inria.diverse.cloning.external-libs/.settings/org.eclipse.jdt.core.prefs b/fr.inria.diverse.cloning.external-libs/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f42de363afaae68bbd968318f1d331877f5514fc
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/fr.inria.diverse.cloning.external-libs/META-INF/MANIFEST.MF b/fr.inria.diverse.cloning.external-libs/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..8b2aaee3e7a345761fe7d1aec7c8da3cfa35a606
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: External-libs
+Bundle-SymbolicName: fr.inria.diverse.cloning.external-libs
+Bundle-Version: 0.1.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: lib/commons-io-1.4.jar,
+ lib/jopt-simple-4.6.jar,
+ lib/slf4j-api-1.6.6.jar,
+ lib/slf4j-jdk14-1.6.6.jar,
+ lib/zt-zip-1.7.jar,
+ .
+Export-Package: joptsimple
diff --git a/fr.inria.diverse.cloning.external-libs/build.properties b/fr.inria.diverse.cloning.external-libs/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4d92724042eaf9fdc48fa8a8ed192e4f69c44c6a
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               lib/commons-io-1.4.jar,\
+               lib/jopt-simple-4.6.jar,\
+               lib/slf4j-api-1.6.6.jar,\
+               lib/slf4j-jdk14-1.6.6.jar,\
+               lib/zt-zip-1.7.jar
diff --git a/fr.inria.diverse.cloning.external-libs/pom.xml b/fr.inria.diverse.cloning.external-libs/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47e6b4c184b4ccc8732d078a6b096a70bba7fd3e
--- /dev/null
+++ b/fr.inria.diverse.cloning.external-libs/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Université de Rennes 1.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+  
+  Contributors:
+      Erwan Bousse - initial API and implementation
+-->
+<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>
+  <groupId>fr.inria.diverse.cloning</groupId>
+  <artifactId>fr.inria.diverse.cloning.external-libs</artifactId>
+  <version>0.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  
+   <parent>
+    <groupId>fr.inria.diverse.cloning</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+  </parent>
+  
+  <dependencies>
+                <dependency>
+                        <groupId>org.zeroturnaround</groupId>
+                        <artifactId>zt-zip</artifactId>
+                        <version>1.7</version>
+                        <type>jar</type>
+                        <scope>compile</scope>
+                </dependency>
+                <dependency>
+                        <groupId>net.sf.jopt-simple</groupId>
+                        <artifactId>jopt-simple</artifactId>
+                        <version>4.6</version>
+                        <type>jar</type>
+                        <scope>compile</scope>
+                </dependency>
+                <dependency>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-jdk14</artifactId>
+                        <version>1.6.6</version>
+                        <type>jar</type>
+                        <scope>compile</scope>
+                </dependency>
+        </dependencies>
+        
+        
+   <build>
+    <plugins>
+      
+      <plugin>
+       
+    <groupId>org.apache.maven.plugins</groupId>
+       
+    <artifactId>maven-dependency-plugin</artifactId>
+   <executions>
+       <execution>
+       
+            <id>copy-dependencies</id>
+       
+            <phase>initialize</phase>
+               <goals>
+       
+                <goal>copy-dependencies</goal>
+               </goals>
+             <configuration>
+       
+                    <overWriteIfNewer>true</overWriteIfNewer>
+       
+                <outputDirectory>${project.basedir}/lib</outputDirectory>
+       
+<markersDirectory>${project.basedir}/lib</markersDirectory>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
+                        <plugin>
+       
+<groupId>org.apache.maven.plugins</groupId>
+       
+<artifactId>maven-clean-plugin</artifactId>
+                                <executions>
+                                        <execution>
+       
+<id>clean-dependencies</id>
+                                                <phase>clean</phase>
+                                                <goals>
+       
+<goal>clean</goal>
+                                                </goals>
+                                                <configuration>
+                                                        <filesets>
+       
+<fileset>
+       
+<directory>lib</directory>
+       
+<includes>
+       
+<include>**/*</include>
+       
+</includes>
+       
+</fileset>
+                                                        </filesets>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin> 
+      
+      </plugins>
+      
+      
+      
+      
+   </build>
+   
+  
+  
+</project>
diff --git a/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~ b/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~
deleted file mode 100644
index 0d5375f30d278220f2a1b3b2bbc5a842ea1414a2..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.materialgenerator.cli.product/pom.xml~
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning.benchmark</groupId>
-  <artifactId>fr.inria.diverse.cloning.materialgenerator.cli.product</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-repository</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-  </parent>
-  
-  
-   <build>
-    <plugins>
-
-      <plugin>
-      <groupId>org.eclipse.tycho</groupId>
-         <artifactId>tycho-p2-director-plugin</artifactId>
-         <version>${tycho.version}</version>
-         <executions>
-            <execution>
-               <id>create-product-distributions</id>
-               <goals>
-                  <goal>materialize-products</goal>
-                  <goal>archive-products</goal>
-               </goals>
-            </execution>
-         </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-  
-</project>
diff --git a/fr.inria.diverse.cloning.runtime/pom.xml~ b/fr.inria.diverse.cloning.runtime/pom.xml~
deleted file mode 100644
index 198037e0108a1cfcf6bbf8263dd1f2051e0cc29c..0000000000000000000000000000000000000000
--- a/fr.inria.diverse.cloning.runtime/pom.xml~
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <groupId>fr.inria.diverse.cloning</groupId>
-  <artifactId>fr.inria.diverse.cloning.runtime</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
-   <parent>
-    <groupId>fr.inria.diverse.cloning</groupId>
-    <artifactId>fr.inria.diverse.cloning.master</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../fr.inria.diverse.cloning.master/pom.xml</relativePath>
-  </parent>
-  
-  
-</project>