diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.classpath b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.classpath
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.classpath
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.classpath
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.project b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.project
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.project
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.project
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/.settings/org.eclipse.jdt.core.prefs
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/META-INF/MANIFEST.MF
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/META-INF/MANIFEST.MF
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/build.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/build.properties
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/build.properties
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/build.properties
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/pom.xml
similarity index 90%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/pom.xml
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/pom.xml
index d237a67a7e54c8f28b98788a2158d2da74c13171..175325996a4929839846105b0e4a85143e025434 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/pom.xml
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
  
   <groupId>fr.centralesupelec.edf.riseclipse</groupId>
-  <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui</artifactId>
+  <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
@@ -14,7 +14,7 @@
   </parent>
 
   <properties>
-    <toolName>RiseClipseSCLValidatorApplication</toolName>
+    <toolName>RiseClipseValidatorSCLApplication</toolName>
   </properties>
 
   <build>
@@ -39,7 +39,7 @@
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui.application.RiseClipseSCLValidatorApplication</mainClass>
+                  <mainClass>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui.application.RiseClipseValidatorSCLApplication</mainClass>
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>plugin.properties</resource>
@@ -65,7 +65,7 @@
   <dependencies>
     <dependency>
       <groupId>fr.centralesupelec.edf.riseclipse</groupId>
-      <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools</artifactId>
+      <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator</artifactId>
       <version>1.1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/application/RiseClipseValidatorSCLApplication.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/application/RiseClipseValidatorSCLApplication.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/application/RiseClipseValidatorSCLApplication.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/application/RiseClipseValidatorSCLApplication.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/OCLFilePane.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/OCLFilePane.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/OCLFilePane.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/OCLFilePane.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultFrame.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultFrame.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultFrame.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultFrame.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultPane.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultPane.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultPane.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/ResultPane.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SCLFilePane.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SCLFilePane.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SCLFilePane.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SCLFilePane.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileCheckBox.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileCheckBox.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileCheckBox.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileCheckBox.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileList.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileList.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileList.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/SclFileList.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/TextLineNumber.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/TextLineNumber.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/TextLineNumber.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/ui/component/TextLineNumber.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.classpath b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.classpath
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.classpath
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.classpath
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.gitignore b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.gitignore
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.gitignore
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.gitignore
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.project b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.project
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.project
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.project
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/.settings/org.eclipse.jdt.core.prefs
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/.settings/org.eclipse.jdt.core.prefs
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/META-INF/MANIFEST.MF
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/META-INF/MANIFEST.MF
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/META-INF/MANIFEST.MF
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/build.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/build.properties
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/build.properties
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/build.properties
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/plugin.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/plugin.properties
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/plugin.properties
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/plugin.properties
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/pom.xml
similarity index 96%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/pom.xml
index e25b1e06740b3fab1633a4573e453034a9b4b277..8919c23f3dc4cc2dc61d5f1a910ade6bc040dbe2 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
  
   <groupId>fr.centralesupelec.edf.riseclipse</groupId>
-  <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools</artifactId>
+  <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/BasicTypeValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/BasicTypeValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/BasicTypeValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/BasicTypeValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/CDCValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/CDCValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/CDCValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/CDCValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/ConstructedAttributeValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/ConstructedAttributeValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/ConstructedAttributeValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/ConstructedAttributeValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataAttributePresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataAttributePresenceConditionValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataAttributePresenceConditionValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataAttributePresenceConditionValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/GenericPresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/GenericPresenceConditionValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/GenericPresenceConditionValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/GenericPresenceConditionValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/LNClassValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/LNClassValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/LNClassValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/LNClassValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdEObjectValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/NsdValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataAttributePresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataAttributePresenceConditionValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataAttributePresenceConditionValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataAttributePresenceConditionValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataObjectPresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataObjectPresenceConditionValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataObjectPresenceConditionValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/SubDataObjectPresenceConditionValidator.java
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/TypeValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/TypeValidator.java
similarity index 100%
rename from fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/TypeValidator.java
rename to fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/TypeValidator.java
diff --git a/pom.xml b/pom.xml
index 4bf8e2d1f676bd4ec7f0ff15336f8eba77932bc2..36230b980a3ef8baef9f33ef7a6179a2916e16e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,8 +146,8 @@
 
 
   <modules>
-    <module>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools</module>
-    <module>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.ui</module>
+    <module>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator</module>
+    <module>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.ui</module>
   </modules>
 
 </project>