diff --git a/plugins/docx/org.eclipse.papyrus.model2doc.docx/build.properties b/plugins/docx/org.eclipse.papyrus.model2doc.docx/build.properties
index 4e934f2..c698c17 100755
--- a/plugins/docx/org.eclipse.papyrus.model2doc.docx/build.properties
+++ b/plugins/docx/org.eclipse.papyrus.model2doc.docx/build.properties
@@ -4,4 +4,5 @@
                .,\
                templates/,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               icons/
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png b/plugins/docx/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png
similarity index 100%
rename from plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png
rename to plugins/docx/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png
Binary files differ
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/META-INF/MANIFEST.MF
index dbf7060..89123ab 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture;bundle-version="[0.8.0,1.0.0)",
- org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation;bundle-version="[0.8.0,1.0.0)"
+ org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation;bundle-version="[0.8.0,1.0.0)",
+ org.eclipse.papyrus.model2doc.docx;bundle-version="[0.8.0,1.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.model2doc.integration.docx.uml.architecture
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/build.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/build.properties
index 7c5f21e..2e4d537 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/build.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/build.properties
@@ -3,7 +3,6 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
                about.html,\
                resources/
 src.includes = about.html
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst
index b6c6d81..d6cfbf3 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmi:id="DOCX-EmptyUMLDocumentStructureTemplateType" type="DOCX-EmptyUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png" description="Empty Template for UML documentation under docx format">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmi:id="DOCX-EmptyUMLDocumentStructureTemplateType" type="DOCX-EmptyUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" description="Empty Template for UML documentation under docx format">
   <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.emptyDocument" documentTemplatePrototype="DOCX-EmptyUMLDocumentStructureTemplateType" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.emptyDocument">
     <documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvh" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.docx/templates/PapyrusTemplate.dotx" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.docx" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
     <author xmi:type="author:Author" xmi:id="_IXzwcJ81EemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
index 9e8bd43..98aafab 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-genericTextDocumentPrototype.pdst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="DOCX-GenericUMLDocumentStructureTemplate" type="DOCX-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png" description="Generic Template for UML documentation under docx format. This template allows to describe a classes stucture.">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="DOCX-GenericUMLDocumentStructureTemplate" type="DOCX-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" description="Generic Template for UML documentation under docx format. This template allows to describe a classes stucture.">
   <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" documentTemplatePrototype="DOCX-GenericUMLDocumentStructureTemplate" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument">
     <documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvg" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.docx/templates/PapyrusTemplate.dotx" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.docx" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
     <author xmi:type="author:Author" xmi:id="_HlEJEJ8uEemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
index 6bd4faf..9994918 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-umlDocument.architecture
@@ -4,7 +4,7 @@
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_1tp4cOEIEeiLVapXeWCJtQ" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_v6j60Ci7EeuXVsN3JsOSRg _4TetkCi7EeuXVsN3JsOSRg"/>
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_dmWHgLp3EeiViqj5DY8SRQ" id="org.eclipse.papyrus.uml.design" name="Software Design" description="" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_4TetkCi7EeuXVsN3JsOSRg _v6j60Ci7EeuXVsN3JsOSRg"/>
     <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations#_--FKQKJQEemnzshfQ11WZw"/>
-    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_v6j60Ci7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.emptyDocument" name="DOCX - Empty Text Document" description="Generate empty docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png" grayedIcon="" implementationID="DOCX-EmptyUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_v6j60Ci7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.emptyDocument" name="DOCX - Empty Text Document" description="Generate empty docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" grayedIcon="" implementationID="DOCX-EmptyUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
       <modelRules xmi:type="representation_1:ModelRule" xmi:id="_yQX7oCi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
@@ -13,7 +13,7 @@
       </owningRules>
       <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/resources/docx-emptyTextDocumentPrototype.pdst#DOCX-EmptyUMLDocumentStructureTemplateType"/>
     </representationKinds>
-    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" name="DOCX - Generic Text Document" description="Generate generic docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.integration.docx.uml.architecture/icons/docx_generic_document.png" implementationID="DOCX-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.docx.uml.architecture.genericDocument" name="DOCX - Generic Text Document" description="Generate generic docx document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.docx/icons/docx_generic_document.png" implementationID="DOCX-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
       <modelRules xmi:type="representation_1:ModelRule" xmi:id="_4TetkSi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/META-INF/MANIFEST.MF
index 4f277a1..ef00c8b 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@
  org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture;bundle-version="[0.8.0,1.0.0)",
- org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation;bundle-version="[0.8.0,1.0.0)"
+ org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation;bundle-version="[0.8.0,1.0.0)",
+ org.eclipse.papyrus.model2doc.odt;bundle-version="[0.8.0,1.0.0)"
 Export-Package: org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.internal.utils
 Bundle-Activator: org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/build.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/build.properties
index bbf0500..7bb9518 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/build.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/build.properties
@@ -3,7 +3,6 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
                resources/,\
                about.html
 src.includes = about.html
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst
index 8e0a971..047feb6 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmi:id="ODT-EmptyUMLDocumentStructureTemplateType" type="ODT-EmptyUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png" description="Empty Template for UML documentation under odt format">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmi:id="ODT-EmptyUMLDocumentStructureTemplateType" type="ODT-EmptyUMLDocumentStructureTemplateType" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" description="Empty Template for UML documentation under odt format">
   <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.emptyDocument" documentTemplatePrototype="ODT-EmptyUMLDocumentStructureTemplateType" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.emptyDocument">
     <documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvh" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.odt/templates/PapyrusTemplate.ott" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.odt" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
     <author xmi:type="author:Author" xmi:id="_IXzwcJ81EemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
index 4f21f09..5dd4930 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-genericTextDocumentPrototype.pdst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="ODT-GenericUMLDocumentStructureTemplate" type="ODT-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png" description="Generic Template for UML documentation under odt format. This template allows to describe a classes stucture.">
+<documentstructuretemplate:DocumentTemplatePrototype xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:author="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/Author" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_1="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate" xmlns:documentstructuretemplate_2="http://www.eclipse.org/papyrus/model2doc/nattable/integration/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:generatorconfiguration="http://www.eclipse.org/papyrus/model2doc/1.0.0/generatorconfiguration" xmlns:umldocumentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/uml/1.0.0/documentstructuretemplate" xmi:id="ODT-GenericUMLDocumentStructureTemplate" type="ODT-GenericUMLDocumentStructureTemplate" iconPath="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" description="Generic Template for UML documentation under odt format. This template allows to describe a classes stucture.">
   <documentTemplate xmi:type="documentstructuretemplate:TextDocumentTemplate" xmi:id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" documentTemplatePrototype="ODT-GenericUMLDocumentStructureTemplate" name="UML Document" kindId="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument">
     <documentStructureGeneratorConfiguration xmi:type="generatorconfiguration:DefaultDocumentStructureGeneratorConfiguration" xmi:id="_9Q98AFIeEemOIbfVEaiEvg" saveDocumentStructure="true" saveImages="true" templateFile="platform:/plugin/org.eclipse.papyrus.model2doc.odt/templates/PapyrusTemplate.ott" documentFolder="output" documentGeneratorId="org.eclipse.papyrus.model2doc.document.generator.odt" structureGeneratorId="TextDocumentStructureGenerator.default" imageFolder="output/images" structureFolder="output"/>
     <author xmi:type="author:Author" xmi:id="_HlEJEJ8uEemosPVxvgaz8g" firstName="Papyrus-Model2Doc" lastName="Generator"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
index 774c17f..971b8d9 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-umlDocument.architecture
@@ -4,7 +4,7 @@
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_1tp4cOEIEeiLVapXeWCJtQ" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_v6j60Ci7EeuXVsN3JsOSRg _4TetkCi7EeuXVsN3JsOSRg"/>
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_dmWHgLp3EeiViqj5DY8SRQ" id="org.eclipse.papyrus.uml.design" name="Software Design" description="" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_4TetkCi7EeuXVsN3JsOSRg _v6j60Ci7EeuXVsN3JsOSRg"/>
     <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations#_--FKQKJQEemnzshfQ11WZw"/>
-    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_v6j60Ci7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.emptyDocument" name="ODT - Empty Text Document" description="Generate empty odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png" implementationID="ODT-EmptyUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_v6j60Ci7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.emptyDocument" name="ODT - Empty Text Document" description="Generate empty odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" implementationID="ODT-EmptyUMLDocumentStructureTemplateType" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
       <modelRules xmi:type="representation_1:ModelRule" xmi:id="_yQX7oCi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
@@ -13,7 +13,7 @@
       </owningRules>
       <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/resources/odt-emptyTextDocumentPrototype.pdst#ODT-EmptyUMLDocumentStructureTemplateType"/>
     </representationKinds>
-    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" name="ODT - Generic Text Document" description="Generate generic odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png" implementationID="ODT-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
+    <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_4TetkCi7EeuXVsN3JsOSRg" id="org.eclipse.papyrus.model2doc.integration.odt.uml.architecture.genericDocument" name="ODT - Generic Text Document" description="Generate generic odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png" implementationID="ODT-GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.architecture.CreatePapyrusDocumentTemplateEditorCommand">
       <modelRules xmi:type="representation_1:ModelRule" xmi:id="_4TetkSi7EeuXVsN3JsOSRg" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt/build.properties b/plugins/odt/org.eclipse.papyrus.model2doc.odt/build.properties
index dc290bc..e556aae 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt/build.properties
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt/build.properties
@@ -5,5 +5,6 @@
                plugin.properties,\
                templates/,\
                plugin.xml,\
-               about.html
+               about.html,\
+               icons/
 src.includes = about.html
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png b/plugins/odt/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png
similarity index 100%
rename from plugins/integration/org.eclipse.papyrus.model2doc.integration.odt.uml.architecture/icons/odt_generic_document.png
rename to plugins/odt/org.eclipse.papyrus.model2doc.odt/icons/odt_generic_document.png
Binary files differ