diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
index 95b0d20bd7df3adbfa1d9d2ef8841b014ca3f244..ab70b0b762d17cb012ce690ee7c508c56b26028e 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/build.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 
 bin.includes = .,\
                icons/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
index cadd563a7a46c777cc66e56b54e8f543adca5020..084f5a96151b80ffec4547fcef5a9e6437239bfb 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 
 pluginName = RiseClipse CIM Header Edit Support
 providerName = CentraleSupélec & EDF
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
index 4c1911ff8ac9d27dd910d21ded8a41f45c767e87..7842a981e12f37fe44af994fe9d85e5a8e7607ed 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/plugin.xml
@@ -2,24 +2,24 @@
 <?eclipse version="3.0"?>
 
 <!--
-/*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */ 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
 -->
 
 <plugin>
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml
index 7ec79d236d82cd535dca90d945b61aba7807d591..dce823836848d840ffa8b5c7b47a9cb0b3fd8fc8 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/pom.xml
@@ -1,4 +1,29 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+-->
+
+<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>
  
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
index 44bbc097842fbea5c3a2d094fbb9e574333ee4ae..fa2ab9e6f3f1694da105a24a0777ee6088be3573 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/DifferenceModelItemProvider.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
 import java.util.Collection;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
index 97245c92515d14d6ebcd793a19e09d117478fab4..7a4b4b5761b963368b477cfea466e0698e8a5085 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/FullModelItemProvider.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
 import java.util.Collection;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
index f0b4693a6006627a4dab598bb59a4491872b96e0..b241972425c88bc413789f9a578f78ce381cd98c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/HeaderModelEditPlugin.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
index bdd5dd12abb16e40bb4f36dba33fe2c3caf246ab..9fdebd6c7004c5ae6dfc0b1b2598bbd623510aa1 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelDescriptionItemProviderAdapterFactory.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
 import java.util.ArrayList;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
index 8877a9147b5e195502654d81e57553980a171df6..d885d011759e027ff916d3654f7c5be8d8e5ca02 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel.edit/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/provider/ModelItemProvider.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.provider;
 
 import java.util.Collection;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.cim.headerModel/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca867ceb49e79d2402935261ec3e3809..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
index 5a59773a7bf46395b02bebb96d4ac9c112e4d403..540ef11c2e52fd8db66ea9719b9c75a550a6c0f8 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/build.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 
 bin.includes = .,\
                model/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
index ff94f88fa17df04523b8f53d7c590ba1d7864721..835a1711ee2901b6d55b599da6b52032cb32a270 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/model/headerModel.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2018 CentraleSupélec &amp; EDF.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v1.0&#xA; which accompanies this distribution, and is available at&#xA; http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA; This file is part of the RiseClipse tool&#xA; &#xA; Contributors:&#xA;     Computer Science Department, CentraleSupélec&#xA;     EDF R&amp;D&#xA; Contacts:&#xA;     dominique.marcadet@centralesupelec.fr&#xA;     aurelie.dehouck-neveu@edf.fr&#xA; Web site:&#xA;     http://wdi.supelec.fr/software/RiseClipse/&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2019 CentraleSupélec &amp; EDF.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-v20.html&#xA;&#xA; This file is part of the RiseClipse tool&#xA; &#xA; Contributors:&#xA;     Computer Science Department, CentraleSupélec&#xA;     EDF R&amp;D&#xA; Contacts:&#xA;     dominique.marcadet@centralesupelec.fr&#xA;     aurelie.dehouck-neveu@edf.fr&#xA; Web site:&#xA;     http://wdi.supelec.fr/software/RiseClipse/&#xA;"
     modelDirectory="/fr.centralesupelec.edf.riseclipse.cim.headerModel/src" modelPluginID="fr.centralesupelec.edf.riseclipse.cim.headerModel"
     modelName="HeaderModel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
index c5f5a353fab2aa4c412abcb063e96cf9f1fcfdb3..8f84dc8090444123fc715bfb1366ec067bb546d5 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 
 pluginName = RiseClipse CIM Header Metamodel
 providerName = CentraleSupélec & EDF
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
index 7d7e893d505e4814d15516cb4a913fe505d99d90..96aac79fd55a25aea37b3c5bc3e02881d2cbf0c2 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/plugin.xml
@@ -2,24 +2,24 @@
 <?eclipse version="3.0"?>
 
 <!--
-/*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */ 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
 -->
 
 <plugin>
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml
index a431f4b3f287140c26a3186475d8ade28243c486..31265009fcc9c73284b3f03a749cc0f3bf25989a 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/pom.xml
@@ -1,4 +1,29 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+-->
+
+<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>
  
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
index 16544102e42cbc49c7ad48a850819008054c8fe9..d5a27c29525174576b92ce6eb2d1b60348e5944a 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/DifferenceModel.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
 /**
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
index a76a1419ef467addda9ea3020d7844ea0262c5fa..243279ec048debdded1da28c74a79fa9c74c84ae 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/FullModel.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
 /**
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
index 1de4ad4b7ef698cc641d7242e47b34d3018517f2..82d4a6c129c2473550e2c818ce90b5f3aa4dddf5 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/Model.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
 import java.util.Date;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
index 28da70e2f56eef990adaee51f26dced533f70be5..08840deb895a524a4b7c8fd6355d88568f93c7c9 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionFactory.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
 import org.eclipse.emf.ecore.EFactory;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
index 287786a46a5731a0431a21878d5970edc9516f7b..87528d81184aef257944815df19e3641d732c38a 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/ModelDescriptionPackage.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription;
 
 import org.eclipse.emf.ecore.EAttribute;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
index 932eb4657486990cb612e222bf71aa736e632916..f943a97a9525bef10d0c31eecc8460e78c186715 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/DifferenceModelImpl.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
index c416be2c925a091d4c85c128cf32fb2eab8f6d8f..3c572afb68ce7e0d5c501825088dcf3dfe63be34 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/FullModelImpl.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
index 8dbf10966a243d5ff24e92f645b449dff899af5c..11a898ce805751370b7f3261031526ced408254b 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionFactoryImpl.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
 import org.eclipse.emf.ecore.EClass;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
index 30b64c31f35e9f5cae3f27904c117e0a0ff73c1c..2e338b9677f64999243c38da2ebb914ffea0468f 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelDescriptionPackageImpl.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
index ae2590e09f321e1e757e00034775381c27952b48..a9199032bbf6bf904d06ccf14ad543cb70802dad 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/impl/ModelImpl.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.impl;
 
 import java.util.Collection;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
index b43b4992de45ed1474fa5ea5c13835e2f1f4c8f4..c688de1c39dfb24c4dcaf0ba79ec65ab8c7b96b5 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionAdapterFactory.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.util;
 
 import org.eclipse.emf.common.notify.Adapter;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
index f6579eb4bd1d4e665a9decf3aa086739a3068b3c..e520e62ced0ef1dda91f54b60b071b064cdc7072 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.headerModel/src/fr/centralesupelec/edf/riseclipse/cim/headerModel/ModelDescription/util/ModelDescriptionSwitch.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.headerModel.ModelDescription.util;
 
 import org.eclipse.emf.ecore.EObject;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.cim.util/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca867ceb49e79d2402935261ec3e3809..0000000000000000000000000000000000000000
--- a/fr.centralesupelec.edf.riseclipse.cim.util/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/build.properties b/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
index 6e7bc5ecad6083b9e0708f67c78d9ea08890ffed..032fda3261800c82d382b673bb270b2efda40a38 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/build.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties b/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
index 9414d09cf759eb8acabeab9af8eaf31a12535f05..604758e0170e67252e7d8acad4a083d50dbb8964 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/plugin.properties
@@ -1,21 +1,21 @@
-#
-#  Copyright (c) 2018 CentraleSupélec & EDF.
-#  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
-# 
-#  This file is part of the RiseClipse tool
-#  
-#  Contributors:
-#      Computer Science Department, CentraleSupélec
-#      EDF R&D
-#  Contacts:
-#      dominique.marcadet@centralesupelec.fr
-#      aurelie.dehouck-neveu@edf.fr
-#  Web site:
-#      http://wdi.supelec.fr/software/RiseClipse/
-#
+# *************************************************************************
+# **  Copyright (c) 2019 CentraleSupélec & EDF.
+# **  All rights reserved. This program and the accompanying materials
+# **  are made available under the terms of the Eclipse Public License v2.0
+# **  which accompanies this distribution, and is available at
+# **  https://www.eclipse.org/legal/epl-v20.html
+# ** 
+# **  This file is part of the RiseClipse tool
+# **  
+# **  Contributors:
+# **      Computer Science Department, CentraleSupélec
+# **      EDF R&D
+# **  Contacts:
+# **      dominique.marcadet@centralesupelec.fr
+# **      aurelie.dehouck-neveu@edf.fr
+# **  Web site:
+# **      http://wdi.supelec.fr/software/RiseClipse/
+# *************************************************************************
 
 pluginName = RiseClipse CIM Utilities
 providerName = CentraleSupélec & EDF
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml b/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml
index d405365e80d30679399f3b52a1d0f6d1ebb098c7..5d875a498d76b950cfbff8630834e9bf3327bc96 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/pom.xml
@@ -1,4 +1,29 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+-->
+
+<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>
  
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimConstants.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimConstants.java
index 6f7c1877480960db13976d13f6712f41e8f2a6d7..8f8cd938edf2f60a41d421fb2c1378b3356bd3f0 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimConstants.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimConstants.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 public abstract class AbstractCimConstants {
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResource.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResource.java
index f76bab5eadec7f94328b8bcae61c7ab6bda4984b..f33656e57045fcc030290f9c177c16237374da45 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResource.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResource.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import java.util.HashMap;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceFactory.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceFactory.java
index 6987f6e387a520ac443eeb431399cf4ec355ddac..6822b7f3376f9211cfd8eef1a8f20f23d93a4af1 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceFactory.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import java.util.HashMap;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceHandler.java
index fcbdbadb66721780ae36714de595093a13c9fed8..5d10a97d50f4fc9d8e4ff4840afcc02e74b33c2d 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceHandler.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import java.io.IOException;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSet.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSet.java
index a94049965ea0f8f7491856d6476b0b72ab46c67c..44f9c54da7cc1b52b0a39b0aa08cf15c105c1c2c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSet.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSet.java
@@ -1,22 +1,23 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
+/*
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSetFactory.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSetFactory.java
index a2aad20940c846fe019c1e86ad75c98b12b01ec1..94f8459f8f8cb6b0a066821fabb18bacedb53203 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSetFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimResourceSetFactory.java
@@ -1,22 +1,23 @@
-/**
- *  Copyright (c) 2019 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- * 
- */
+/*
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHandler.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHandler.java
index c35350e5b7295784eca8fd18df561c5962bced02..9feb08f7ccd8dc2cb2257347bca41600b29fdd8c 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHandler.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHandler.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import java.util.Date;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHelper.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHelper.java
index c8ce46b15560a959524b7431fa3edcbf282db348..94e71652c501bd972cec1ec9cd713123828b292d 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHelper.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlHelper.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlLoad.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlLoad.java
index 28d0b70f1d6b034c3126378f3b5ec5deb3ebeeb2..217abf0fe9a33088400fbf3bf3b59616bff1918a 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlLoad.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlLoad.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import org.eclipse.emf.ecore.xmi.XMLHelper;
diff --git a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlSave.java b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlSave.java
index 54ab81b40e85e63c90eb9e344918c00da74cb5bb..c61ffa63578fc43a75afc36b3874e3c063abf9e2 100644
--- a/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlSave.java
+++ b/fr.centralesupelec.edf.riseclipse.cim.util/src/fr/centralesupelec/edf/riseclipse/cim/util/cimxml/AbstractCimXmlSave.java
@@ -1,21 +1,23 @@
 /*
- *  Copyright (c) 2018 CentraleSupélec & EDF.
- *  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
- * 
- *  This file is part of the RiseClipse tool
- *  
- *  Contributors:
- *      Computer Science Department, CentraleSupélec
- *      EDF R&D
- *  Contacts:
- *      dominique.marcadet@centralesupelec.fr
- *      aurelie.dehouck-neveu@edf.fr
- *  Web site:
- *      http://wdi.supelec.fr/software/RiseClipse/
- */
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+*/
 package fr.centralesupelec.edf.riseclipse.cim.util.cimxml;
 
 import java.util.List;
diff --git a/pom.xml b/pom.xml
index e7e3e9854a50b484b3d2b767563778298d52a04b..6caa654429f27598bb10aa0e00b176585e155f52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,29 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+*************************************************************************
+**  Copyright (c) 2019 CentraleSupélec & EDF.
+**  All rights reserved. This program and the accompanying materials
+**  are made available under the terms of the Eclipse Public License v2.0
+**  which accompanies this distribution, and is available at
+**  https://www.eclipse.org/legal/epl-v20.html
+** 
+**  This file is part of the RiseClipse tool
+**  
+**  Contributors:
+**      Computer Science Department, CentraleSupélec
+**      EDF R&D
+**  Contacts:
+**      dominique.marcadet@centralesupelec.fr
+**      aurelie.dehouck-neveu@edf.fr
+**  Web site:
+**      http://wdi.supelec.fr/software/RiseClipse/
+*************************************************************************
+-->
+
+<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>