diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.edit/plugin.xml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.edit/plugin.xml
index 8dc5c6b..16c87b4 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.edit/plugin.xml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.edit/plugin.xml
@@ -20,7 +20,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated markup-documentstructuretemplate -->
       <factory
-            uri="http:///markupdocumentstructuretemplate.ecore"
+            uri="http://www.eclipse.org/papyrus/model2doc/markup/emf/1.0.0/documentstructuretemplate"
             class="org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.provider.MarkupEMFDocumentStructureTemplateItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.ecore b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.ecore
index 8536294..fe2672c 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.ecore
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="documentstructuretemplate" nsURI="http:///markupdocumentstructuretemplate.ecore"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="documentstructuretemplate" nsURI="http://www.eclipse.org/papyrus/model2doc/markup/emf/1.0.0/documentstructuretemplate"
     nsPrefix="markup.emf.documentstructuretemplate">
   <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
     <details key="originalName" value="markupdocumentstructuretemplate"/>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.uml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.uml
index 30d1111..388ed0c 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.uml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/model/markup-documentstructuretemplate.uml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
-  <uml:Model xmi:id="_FoOBEDggEe6xgp_1PvLKwA" name="markup-documentstructuretemplate">
+  <uml:Model xmi:id="_FoOBEDggEe6xgp_1PvLKwA" name="markup-documentstructuretemplate" URI="http://www.eclipse.org/papyrus/model2doc/markup/emf/1.0.0/documentstructuretemplate">
     <packageImport xmi:type="uml:PackageImport" xmi:id="_Fv3hMDggEe6xgp_1PvLKwA">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/plugin.xml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/plugin.xml
index 9c5815c..327de1c 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/plugin.xml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/plugin.xml
@@ -4,7 +4,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated markup-documentstructuretemplate -->
       <package
-            uri="http:///markupdocumentstructuretemplate.ecore"
+            uri="http://www.eclipse.org/papyrus/model2doc/markup/emf/1.0.0/documentstructuretemplate"
             class="org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate.MarkupEMFDocumentStructureTemplatePackage"
             genModel="model/markup-documentstructuretemplate.genmodel"/>
    </extension>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/emf/documentstructuretemplate/MarkupEMFDocumentStructureTemplatePackage.java b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/emf/documentstructuretemplate/MarkupEMFDocumentStructureTemplatePackage.java
index 4214a58..2d521b4 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/emf/documentstructuretemplate/MarkupEMFDocumentStructureTemplatePackage.java
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.emf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/emf/documentstructuretemplate/MarkupEMFDocumentStructureTemplatePackage.java
@@ -54,7 +54,7 @@
 	 *
 	 * @generated
 	 */
-	String eNS_URI = "http:///markupdocumentstructuretemplate.ecore"; //$NON-NLS-1$
+	String eNS_URI = "http://www.eclipse.org/papyrus/model2doc/markup/emf/1.0.0/documentstructuretemplate"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.edit/plugin.xml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.edit/plugin.xml
index 807dd01..1e4baab 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.edit/plugin.xml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.edit/plugin.xml
@@ -20,7 +20,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated markup-umldocumentstructuretemplate -->
       <factory
-            uri="http:///markupumldocumentstructuretemplate.ecore"
+            uri="http://www.eclipse.org/papyrus/model2doc/markup/uml/1.0.0/documentstructuretemplate"
             class="org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.provider.MarkupUMLDocumentStructureTemplateItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.ecore b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.ecore
index fb2677a..aee20ce 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.ecore
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="documentstructuretemplate" nsURI="http:///markupumldocumentstructuretemplate.ecore"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="documentstructuretemplate" nsURI="http://www.eclipse.org/papyrus/model2doc/markup/uml/1.0.0/documentstructuretemplate"
     nsPrefix="markup.uml.documentstructuretemplate">
   <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
     <details key="originalName" value="markupumldocumentstructuretemplate"/>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.uml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.uml
index 76f72fe..34c0497 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.uml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/model/markup-umldocumentstructuretemplate.uml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
-  <uml:Model xmi:id="_3NPHwDgrEe6xuoXtVUjDZg" name="markup-uml-documentstructuretemplate">
+  <uml:Model xmi:id="_3NPHwDgrEe6xuoXtVUjDZg" name="markup-uml-documentstructuretemplate" URI="http://www.eclipse.org/papyrus/model2doc/markup/uml/1.0.0/documentstructuretemplate">
     <packageImport xmi:type="uml:PackageImport" xmi:id="_3OmZsDgrEe6xuoXtVUjDZg">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/plugin.xml b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/plugin.xml
index f98120a..c7f9675 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/plugin.xml
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/plugin.xml
@@ -4,7 +4,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated markup-umldocumentstructuretemplate -->
       <package
-            uri="http:///markupumldocumentstructuretemplate.ecore"
+            uri="http://www.eclipse.org/papyrus/model2doc/markup/uml/1.0.0/documentstructuretemplate"
             class="org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate.MarkupUMLDocumentStructureTemplatePackage"
             genModel="model/markup-umldocumentstructuretemplate.genmodel"/>
    </extension>
diff --git a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/uml/documentstructuretemplate/MarkupUMLDocumentStructureTemplatePackage.java b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/uml/documentstructuretemplate/MarkupUMLDocumentStructureTemplatePackage.java
index 54e8d09..260b0be 100755
--- a/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/uml/documentstructuretemplate/MarkupUMLDocumentStructureTemplatePackage.java
+++ b/plugins/markup/org.eclipse.papyrus.model2doc.markup.uml.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/markup/uml/documentstructuretemplate/MarkupUMLDocumentStructureTemplatePackage.java
@@ -58,7 +58,7 @@
 	 *
 	 * @generated
 	 */
-	String eNS_URI = "http:///markupumldocumentstructuretemplate.ecore"; //$NON-NLS-1$
+	String eNS_URI = "http://www.eclipse.org/papyrus/model2doc/markup/uml/1.0.0/documentstructuretemplate"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.
diff --git a/releng-model2doc/category/category.xml b/releng-model2doc/category/category.xml
index f530aeb..5653199 100755
--- a/releng-model2doc/category/category.xml
+++ b/releng-model2doc/category/category.xml
@@ -39,15 +39,27 @@
    <feature url="features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature" version="0.9.0.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.gmf.category"/>
    </feature>
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature.source_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature.source" version="0.9.0.qualifier">
+      <category name="org.eclipse.papyrus.model2doc.integration.gmf.category"/>
+   </feature>
    <feature url="features/org.eclipse.papyrus.model2doc.markup.emf.feature_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.emf.feature" version="0.9.0.qualifier">
       <category name="org.eclipse.papyrus.model2doc.markup.emf.category"/>
    </feature>
+   <feature url="features/org.eclipse.papyrus.model2doc.markup.emf.feature.source_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.emf.feature.source" version="0.9.0.qualifier">
+      <category name="org.eclipse.papyrus.model2doc.markup.emf.category"/>
+   </feature>   
    <feature url="features/org.eclipse.papyrus.model2doc.markup.uml.feature_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.uml.feature" version="0.9.0.qualifier">
       <category name="org.eclipse.papyrus.model2doc.markup.uml.category"/>
    </feature>
+   <feature url="features/org.eclipse.papyrus.model2doc.markup.uml.feature.source_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.uml.feature.source" version="0.9.0.qualifier">
+      <category name="org.eclipse.papyrus.model2doc.markup.uml.category"/>
+   </feature>
    <feature url="features/org.eclipse.papyrus.model2doc.markup.integration.feature_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.integration.feature" version="0.9.0.qualifier">
       <category name="org.eclipse.papyrus.model2doc.markup.integration.category"/>
    </feature>
+   <feature url="features/org.eclipse.papyrus.model2doc.markup.integration.feature.source_0.9.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.markup.integration.feature.source" version="0.9.0.qualifier">
+      <category name="org.eclipse.papyrus.model2doc.markup.integration.category"/>
+   </feature>   
    <category-def name="org.eclipse.papyrus.model2doc.category" label="Papyrus-Model2Doc">
       <description>
          Papyrus-Model2Doc : EMF and UML Model to Documentation.