diff --git a/diagrams/data/.$processing.drawio.bkp b/diagrams/data/.$processing.drawio.bkp
deleted file mode 100644
index 9dba2d4..0000000
--- a/diagrams/data/.$processing.drawio.bkp
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="Electron" modified="2022-09-17T18:59:12.654Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.7.9 Chrome/85.0.4183.121 Electron/10.1.3 Safari/537.36" etag="lwJLJAsN6v734_29OTrG" version="13.7.9" type="device"><diagram id="y23Pj-HxbtcG2RFrtSEP" name="Page-1">7Vpbd9o4EP41PKYH29iGRweSZnfJZZectnlUsLDVtS2vLAfor1/JlvBFhpICFfT0IYEZjyXNNzfNHHrWOF59JCAN77EPo57Z91c9a9IzTcMyHfbBOeuSMzQEIyDIF0IVY4a+QcHsC26OfJg1BCnGEUVpkznHSQLntMEDhOBlU2yBo+auKQigwpjNQaRyPyOfhkILu1/x7yAKQrmz0RdPYiCFBSMLgY+XNZZ107PGBGNafotXYxhx8CQu5Xu3W55uDkZgQvd5YfRX9unujwc4uv008byX1ZRO6ZVVrvIGolwoLA5L1xIB6DNABIkJDXGAExDdVNxrgvPEh3ybPqMqmSnGKWMajPkVUroW1gU5xYwV0jgST1VVhHYZzskc7ji/dAlAAkh3yAm1uC61DQRQHyGOISVrJkBgBCh6axofCB8KNnLiVY8QsK4JpBglNKut/MQZTECEg+MIXxDBYI5aJmvJ29ZOefalPIGkaqpUrMIN3uES9q/pAYNje0DNCu8H2dUBMsOWrL/w9z/YknwRyxXEZNWg1oI6vXGciwxPd6QhPA0lYz/O/pkq7tR0lmWIKJyloDDWklXqPaPvDRIKVztNIrHrt7CQBXxZVU1DlsKwVjEl5kcPMVMB6s/Z40PPdCK28/UrYd8CulFeI3QDtwmdZemGbnTht4LBnmlneFY1YaCgfj/R7pztuNbvnI4C093zvf4E6FrnBpShlorLCuPhnmEsS82ZxLFh6YD551/u9jbP0Zuvg8wzVKLiyXuYPI61Z5B2qh3Y2jNIX8HKmz1rB8puAWU72oFSL5tPk1vtQDmurQ+op2h97b2iz39/uQmz6+XsjXxbdHQvaq5MfI8P7hiV4ITnRh9kYYGa0YVQK610QKbiU9Pf7lBf8t7Xblb9oYDbaMNYplQhtaOx3IwXty1U5lxloR/oMTutpHqzbJtCQ7ZNY5xQWBz6iv3dYhID3luXYmzXSlIyU8mYYgJjfoY0y/mnjyNMuBMgvhxgp++Z7OB8ppvBOYU050+Bj1KUoTlKAm71CAmpjLkGX4MzUZ7FmJMUxmmxJkrmyEd+Xpw05/8i8Mr259JU7s2pGAQJ4NtE6L8cfKhpkm7tFFkY0qZLZpTgf+G4UGjjvwsURS1WxsKeK2JN7Ip6Lkr9lbktOWAW+YuoiIwQ+T5MlHvDlgSxV0zIF1qu56opw3I7YmYz+D56zjiPGfVh96vvJ6nmhasTCEe9cHXKuQder35seNaaYrjO7uGZY+6UP3h41onMQIfnaPCA0SV4gGtr8AB1ejC586ZHGR8clHadVt51hrqvaq6C1OnmpwdBZ7fG9sO+bujUFlNLxVohWitYjHqpPanKFSdOUK3cPXNVOS75CdOA7ZmyYaoX7zjTxMPSwejcfNpQr2HPj2eAVDv6R/qRUmuMGv6X3+R29wuO1YJ1757X+c5CJ+55DbXedTa9CxTkhAGGk9+t7y/W+rY6EmdwwtaXkdVPv0ofrn5AZ938Dw==</diagram></mxfile>
\ No newline at end of file
diff --git a/diagrams/data/formats.drawio b/diagrams/data/formats.drawio
index 9dba2d4..88d565c 100644
--- a/diagrams/data/formats.drawio
+++ b/diagrams/data/formats.drawio
@@ -1 +1,115 @@
-<mxfile host="Electron" modified="2022-09-17T18:59:12.654Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.7.9 Chrome/85.0.4183.121 Electron/10.1.3 Safari/537.36" etag="lwJLJAsN6v734_29OTrG" version="13.7.9" type="device"><diagram id="y23Pj-HxbtcG2RFrtSEP" name="Page-1">7Vpbd9o4EP41PKYH29iGRweSZnfJZZectnlUsLDVtS2vLAfor1/JlvBFhpICFfT0IYEZjyXNNzfNHHrWOF59JCAN77EPo57Z91c9a9IzTcMyHfbBOeuSMzQEIyDIF0IVY4a+QcHsC26OfJg1BCnGEUVpkznHSQLntMEDhOBlU2yBo+auKQigwpjNQaRyPyOfhkILu1/x7yAKQrmz0RdPYiCFBSMLgY+XNZZ107PGBGNafotXYxhx8CQu5Xu3W55uDkZgQvd5YfRX9unujwc4uv008byX1ZRO6ZVVrvIGolwoLA5L1xIB6DNABIkJDXGAExDdVNxrgvPEh3ybPqMqmSnGKWMajPkVUroW1gU5xYwV0jgST1VVhHYZzskc7ji/dAlAAkh3yAm1uC61DQRQHyGOISVrJkBgBCh6axofCB8KNnLiVY8QsK4JpBglNKut/MQZTECEg+MIXxDBYI5aJmvJ29ZOefalPIGkaqpUrMIN3uES9q/pAYNje0DNCu8H2dUBMsOWrL/w9z/YknwRyxXEZNWg1oI6vXGciwxPd6QhPA0lYz/O/pkq7tR0lmWIKJyloDDWklXqPaPvDRIKVztNIrHrt7CQBXxZVU1DlsKwVjEl5kcPMVMB6s/Z40PPdCK28/UrYd8CulFeI3QDtwmdZemGbnTht4LBnmlneFY1YaCgfj/R7pztuNbvnI4C093zvf4E6FrnBpShlorLCuPhnmEsS82ZxLFh6YD551/u9jbP0Zuvg8wzVKLiyXuYPI61Z5B2qh3Y2jNIX8HKmz1rB8puAWU72oFSL5tPk1vtQDmurQ+op2h97b2iz39/uQmz6+XsjXxbdHQvaq5MfI8P7hiV4ITnRh9kYYGa0YVQK610QKbiU9Pf7lBf8t7Xblb9oYDbaMNYplQhtaOx3IwXty1U5lxloR/oMTutpHqzbJtCQ7ZNY5xQWBz6iv3dYhID3luXYmzXSlIyU8mYYgJjfoY0y/mnjyNMuBMgvhxgp++Z7OB8ppvBOYU050+Bj1KUoTlKAm71CAmpjLkGX4MzUZ7FmJMUxmmxJkrmyEd+Xpw05/8i8Mr259JU7s2pGAQJ4NtE6L8cfKhpkm7tFFkY0qZLZpTgf+G4UGjjvwsURS1WxsKeK2JN7Ip6Lkr9lbktOWAW+YuoiIwQ+T5MlHvDlgSxV0zIF1qu56opw3I7YmYz+D56zjiPGfVh96vvJ6nmhasTCEe9cHXKuQder35seNaaYrjO7uGZY+6UP3h41onMQIfnaPCA0SV4gGtr8AB1ejC586ZHGR8clHadVt51hrqvaq6C1OnmpwdBZ7fG9sO+bujUFlNLxVohWitYjHqpPanKFSdOUK3cPXNVOS75CdOA7ZmyYaoX7zjTxMPSwejcfNpQr2HPj2eAVDv6R/qRUmuMGv6X3+R29wuO1YJ1757X+c5CJ+55DbXedTa9CxTkhAGGk9+t7y/W+rY6EmdwwtaXkdVPv0ofrn5AZ938Dw==</diagram></mxfile>
\ No newline at end of file
+<mxfile host="Electron" modified="2024-07-07T20:01:11.544Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="qm4Tm4lYRFLNZPzDOL54" version="21.2.8" type="device">
+  <diagram id="y23Pj-HxbtcG2RFrtSEP" name="Page-1">
+    <mxGraphModel dx="1418" dy="828" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-3" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="9KsVHINe9FVDAAYxLtLt-1" target="9KsVHINe9FVDAAYxLtLt-2" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="660" y="290" />
+              <mxPoint x="530" y="290" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="9KsVHINe9FVDAAYxLtLt-1" target="9KsVHINe9FVDAAYxLtLt-4" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="9KsVHINe9FVDAAYxLtLt-1" target="9KsVHINe9FVDAAYxLtLt-6" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="650" y="290" />
+              <mxPoint x="790" y="290" />
+              <mxPoint x="790" y="340" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WLuxhgs8zH-iphpkTdnL-2" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="9KsVHINe9FVDAAYxLtLt-1" target="WLuxhgs8zH-iphpkTdnL-1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-1" value="OSR-Lib-Content" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="590" y="210" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-2" value="JSON&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="460" y="340" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-9" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="9KsVHINe9FVDAAYxLtLt-4" target="9KsVHINe9FVDAAYxLtLt-8" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-4" value="MD" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="590" y="340" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-6" value="HTML" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="720" y="340" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-11" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="9KsVHINe9FVDAAYxLtLt-8" target="9KsVHINe9FVDAAYxLtLt-10" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="9KsVHINe9FVDAAYxLtLt-8" target="9KsVHINe9FVDAAYxLtLt-12" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-8" value="PANDOC" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="590" y="460" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-10" value="AST" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="500" y="560" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="9KsVHINe9FVDAAYxLtLt-12" value="PDF" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="675" y="560" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-1" value="" style="endArrow=none;dashed=1;html=1;" parent="1" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint y="40" as="sourcePoint" />
+            <mxPoint x="850" y="40" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-2" value="&lt;h1&gt;Content - Formats&lt;/h1&gt;&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.&lt;/p&gt;" style="text;html=1;strokeColor=none;fillColor=none;spacing=5;spacingTop=-20;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="10" y="170" width="370" height="100" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-3" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="PlyBAbiWQXEhsBwSvrzf-6" target="PlyBAbiWQXEhsBwSvrzf-7" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="620" y="740" />
+              <mxPoint x="620" y="740" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="PlyBAbiWQXEhsBwSvrzf-6" target="PlyBAbiWQXEhsBwSvrzf-9" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="620" y="760" />
+              <mxPoint x="750" y="760" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-6" value="OSRL" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="560" y="680" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-7" value="JSON&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="560" y="800" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-8" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="PlyBAbiWQXEhsBwSvrzf-7" target="PlyBAbiWQXEhsBwSvrzf-13" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-9" value="YAML" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="690" y="800" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-13" value="TOML" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="560" y="900" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-16" value="" style="endArrow=none;dashed=1;html=1;" parent="1" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="10" y="630" as="sourcePoint" />
+            <mxPoint x="860" y="630" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="PlyBAbiWQXEhsBwSvrzf-17" value="&lt;h1&gt;Configuration - Formats&lt;/h1&gt;&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.&lt;/p&gt;" style="text;html=1;strokeColor=none;fillColor=none;spacing=5;spacingTop=-20;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="20" y="640" width="370" height="100" as="geometry" />
+        </mxCell>
+        <mxCell id="WLuxhgs8zH-iphpkTdnL-1" value="OSRL" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="590" y="100" width="120" height="60" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/diagrams/packages - q4.drawio b/diagrams/packages - q4.drawio
index 5665f85..661ffc7 100644
--- a/diagrams/packages - q4.drawio	
+++ b/diagrams/packages - q4.drawio	
@@ -1,10 +1,10 @@
-<mxfile host="Electron" modified="2024-05-24T18:23:08.300Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="9EPEIKtPpmt8Q35KGf1u" compressed="false" version="21.2.8" type="device">
+<mxfile host="Electron" modified="2024-07-07T19:58:52.419Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="j2nkHvq_IQmPOtuSJdbh" compressed="false" version="21.2.8" type="device">
   <diagram id="6UpJVxfaZ7YgvcYAvHzd" name="Page-1">
-    <mxGraphModel dx="2284" dy="1944" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+    <mxGraphModel dx="2268" dy="1928" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="_b3Tva0lv_mxjrXOdc1R-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="_b3Tva0lv_mxjrXOdc1R-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="390" y="-990" width="450" height="350" as="geometry" />
         </mxCell>
         <mxCell id="EJygjR1zJmuZI7U083Qi-2" value="&lt;b&gt;osr-media&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeWidth=1;rounded=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-media" vertex="1">
@@ -30,15 +30,12 @@
         <mxCell id="EJygjR1zJmuZI7U083Qi-23" value="&lt;b&gt;osr-cli-gui&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-cli-gui" vertex="1">
           <mxGeometry x="892.69" y="690" width="121" height="50" as="geometry" />
         </mxCell>
-        <mxCell id="IQ951aPo5dtlSvO6DjOi-1" value="&lt;b&gt;osr-discourse&lt;/b&gt;" style="whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;rounded=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-discourse" vertex="1">
+        <mxCell id="IQ951aPo5dtlSvO6DjOi-1" value="&lt;b&gt;osr-discourse&lt;/b&gt;" style="whiteSpace=wrap;html=1;rounded=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-discourse" vertex="1">
           <mxGeometry x="20" y="360" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="hn-AvrUv4ZEia3uCj308-1" value="&lt;b&gt;osr-bot-commons&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="20.999999999999996" y="700" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="hn-AvrUv4ZEia3uCj308-2" value="&lt;b&gt;osr-oa&lt;/b&gt;" style="whiteSpace=wrap;html=1;shadow=1;rounded=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-oa" vertex="1">
-          <mxGeometry x="21.850000000000005" y="920" width="131.31" height="40" as="geometry" />
-        </mxCell>
         <mxCell id="hn-AvrUv4ZEia3uCj308-3" value="&lt;b&gt;osr-ig&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-ig" vertex="1">
           <mxGeometry x="364.13000000000005" y="770" width="123.18" height="50" as="geometry" />
         </mxCell>
@@ -52,9 +49,9 @@
           <mxGeometry x="892.69" y="1080" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="5omTO39gjbitsYrq9F9_-1" value="&lt;b&gt;osr-smtp&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
-          <mxGeometry x="892.69" y="1060" width="117.31" height="60" as="geometry" />
+          <mxGeometry x="891.69" y="1150" width="117.31" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="MmiEef9QzrD2X3oBvG1z-1" value="&lt;b&gt;osr-shopify&lt;/b&gt;" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
+        <mxCell id="MmiEef9QzrD2X3oBvG1z-1" value="&lt;b&gt;osr-shopify&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="504.1300000000001" y="470" width="118.87" height="60" as="geometry" />
         </mxCell>
         <mxCell id="8bOPJQ6iVCdShEHH_I0T-1" value="&lt;b&gt;osr-specs&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
@@ -64,7 +61,7 @@
           <mxGeometry x="189.28" y="700" width="131.05" height="50" as="geometry" />
         </mxCell>
         <mxCell id="96Drw0ASuPTl6l1RCuBO-2" value="&lt;b&gt;osr-lib-content&lt;/b&gt;" style="whiteSpace=wrap;html=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-lib-content" vertex="1">
-          <mxGeometry x="364.13" y="-170" width="144.75" height="60" as="geometry" />
+          <mxGeometry x="356.82" y="-300" width="144.75" height="60" as="geometry" />
         </mxCell>
         <mxCell id="96Drw0ASuPTl6l1RCuBO-3" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" parent="1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
@@ -85,13 +82,13 @@
           <mxGeometry x="362.84000000000003" y="700" width="120.12" height="60" as="geometry" />
         </mxCell>
         <mxCell id="dqcR9huI1fdkpqvahMpq-1" value="&lt;b&gt;osr-reports&lt;/b&gt;" style="whiteSpace=wrap;html=1;opacity=50;strokeColor=#00fa6c;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="536.88" y="-250" width="141.25" height="60" as="geometry" />
+          <mxGeometry x="360.32000000000005" y="50" width="141.25" height="60" as="geometry" />
         </mxCell>
         <mxCell id="VbxAaJpUfB63OL60K2rH-1" value="&lt;b&gt;osr-search&lt;/b&gt;" style="whiteSpace=wrap;html=1;rounded=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-crawler" vertex="1">
           <mxGeometry x="191.29" y="920" width="120" height="40" as="geometry" />
         </mxCell>
         <mxCell id="Qy2bydGRDOEHGVpc4_tW-1" value="&lt;b&gt;osr-lib-data&lt;/b&gt;" style="whiteSpace=wrap;html=1;opacity=50;strokeColor=#00ff62;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="364.13" y="-250" width="142.25" height="60" as="geometry" />
+          <mxGeometry x="356.82" y="-380" width="142.25" height="60" as="geometry" />
         </mxCell>
         <mxCell id="t3eUf6PuANCPkVOEPp9z-1" value="&lt;b&gt;osr-bootstrap&lt;/b&gt;" style="whiteSpace=wrap;html=1;shadow=1;rounded=0;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-validation" vertex="1">
           <mxGeometry x="21.850000000000023" y="260" width="120" height="60" as="geometry" />
@@ -111,17 +108,14 @@
             <mxPoint x="850" y="440" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="m5u3g-DrV2aJ1_VTPmKo-2" value="&lt;b&gt;osr-lib-data&lt;/b&gt;" style="whiteSpace=wrap;html=1;opacity=50;strokeColor=#00ff62;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="364.13" y="-250" width="142.25" height="60" as="geometry" />
-        </mxCell>
         <mxCell id="m5u3g-DrV2aJ1_VTPmKo-9" value="&lt;b&gt;osr-lib-data&lt;/b&gt;" style="whiteSpace=wrap;html=1;opacity=50;strokeColor=#00ff62;strokeWidth=3;" parent="1" vertex="1">
-          <mxGeometry x="364.13" y="-250" width="142.25" height="60" as="geometry" />
+          <mxGeometry x="195.75" y="-300" width="142.25" height="60" as="geometry" />
         </mxCell>
         <mxCell id="m5u3g-DrV2aJ1_VTPmKo-11" value="&lt;b&gt;osr-templates&lt;/b&gt;" style="whiteSpace=wrap;html=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-templates" vertex="1">
-          <mxGeometry x="364.13" y="-320" width="144" height="60" as="geometry" />
+          <mxGeometry x="356.82" y="-470" width="144" height="60" as="geometry" />
         </mxCell>
         <mxCell id="m5u3g-DrV2aJ1_VTPmKo-14" value="&lt;b&gt;osr-profiles&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#d5e8d4;strokeColor=#82b366;rounded=1;shadow=0;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-templates" vertex="1">
-          <mxGeometry x="364.13" y="-400" width="144" height="60" as="geometry" />
+          <mxGeometry x="356.82" y="-550" width="144" height="60" as="geometry" />
         </mxCell>
         <mxCell id="m5u3g-DrV2aJ1_VTPmKo-15" value="&lt;b&gt;osr-ebay&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;rounded=1;" parent="1" vertex="1">
           <mxGeometry x="20" y="580" width="150" height="50" as="geometry" />
@@ -135,7 +129,7 @@
         <mxCell id="o0f1U-N-PvDt7KBJ-mb2-1" value="&lt;b&gt;osr-directory&lt;/b&gt;" style="whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;rounded=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-discourse" vertex="1">
           <mxGeometry x="500.94" y="360" width="148" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="gS7rbCItSBbtu1rF8xr4-1" value="&lt;b&gt;osr-hugo&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-discourse" vertex="1">
+        <mxCell id="gS7rbCItSBbtu1rF8xr4-1" value="&lt;b&gt;osr-hugo&lt;/b&gt;" style="whiteSpace=wrap;html=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-discourse" vertex="1">
           <mxGeometry x="187.44" y="360" width="150.56" height="60" as="geometry" />
         </mxCell>
         <mxCell id="gS7rbCItSBbtu1rF8xr4-2" value="&lt;b&gt;osr-amazon&lt;/b&gt;" style="whiteSpace=wrap;html=1;dashed=1;rounded=1;" parent="1" vertex="1">
@@ -180,7 +174,7 @@
         <mxCell id="NRKfRufN3FgwSOevAmLn-1" value="&lt;b&gt;osr-search&lt;/b&gt;" style="whiteSpace=wrap;html=1;shadow=1;rounded=1;strokeWidth=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-i18n" vertex="1">
           <mxGeometry x="23.620000000000005" y="50" width="144.38" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="_b3Tva0lv_mxjrXOdc1R-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="_b3Tva0lv_mxjrXOdc1R-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-140" y="-990" width="480" height="240" as="geometry" />
         </mxCell>
         <mxCell id="NRKfRufN3FgwSOevAmLn-2" value="&lt;b&gt;osr-ai&lt;/b&gt;" style="whiteSpace=wrap;html=1;shadow=1;rounded=1;strokeWidth=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-i18n" vertex="1">
@@ -207,7 +201,7 @@
         <mxCell id="wK7Eqod2Vf0PToZw0hUp-1" value="&lt;b&gt;osr-vcs&lt;br&gt;&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeWidth=2;rounded=1;shadow=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-vfs" vertex="1">
           <mxGeometry x="23.860000000000014" y="-980" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="_b3Tva0lv_mxjrXOdc1R-1" value="&lt;b&gt;osr-store&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeWidth=2;rounded=1;shadow=1;" link="https://git.osr-plastic.org/osr-plastic/osr-vfs" vertex="1" parent="1">
+        <mxCell id="_b3Tva0lv_mxjrXOdc1R-1" value="&lt;b&gt;osr-store&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeWidth=2;rounded=1;shadow=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-vfs" vertex="1">
           <mxGeometry x="27.24000000000001" y="-820" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="EJygjR1zJmuZI7U083Qi-20" value="&lt;b&gt;osr-core&lt;/b&gt;" style="whiteSpace=wrap;html=1;rounded=1;strokeColor=#82b366;strokeWidth=1;fillColor=#d5e8d4;shadow=0;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-core" vertex="1">
@@ -228,6 +222,9 @@
         <mxCell id="61kQtUI917ta-0shQPCs-1" value="&lt;b&gt;osr-fs-utils&lt;/b&gt;" style="whiteSpace=wrap;html=1;strokeColor=#006600;strokeWidth=3;rounded=1;shadow=1;" parent="1" link="https://git.osr-plastic.org/osr-plastic/osr-fs" vertex="1">
           <mxGeometry x="400.87" y="-790" width="145" height="60" as="geometry" />
         </mxCell>
+        <mxCell id="JX_kT1y07SgyPbuRiULs-1" value="&lt;b&gt;osr-templates&lt;/b&gt;" style="whiteSpace=wrap;html=1;" link="https://git.osr-plastic.org/osr-plastic/osr-templates" vertex="1" parent="1">
+          <mxGeometry x="526.82" y="-470" width="144" height="60" as="geometry" />
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/diagrams/product/product-pipe-q2.drawio b/diagrams/product/product-pipe-q2.drawio
index daf0fe7..45ad048 100644
--- a/diagrams/product/product-pipe-q2.drawio
+++ b/diagrams/product/product-pipe-q2.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2023-05-08T18:13:41.119Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="sSma0MPZ9JipdVR9aVvw" version="21.2.8" type="device">
+<mxfile host="Electron" modified="2024-07-07T20:09:32.960Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="2XCWdBBWLXCk_SyQo6Pr" version="21.2.8" type="device">
   <diagram name="Page-1" id="5f0bae14-7c28-e335-631c-24af17079c00">
-    <mxGraphModel dx="4605" dy="2482" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" background="#FFFFFF" math="0" shadow="0">
+    <mxGraphModel dx="4925" dy="2482" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" background="#FFFFFF" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -10,7 +10,7 @@
         <mxCell id="ouv5RxtFm94AQLi6APR9-4" value="OSR-RAW - Spec (v1.0)&lt;br&gt;" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1940" y="-860" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;" edge="1" parent="1" source="xzWLFNmYNp8Waed6AO9--1" target="xzWLFNmYNp8Waed6AO9--3">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;" parent="1" source="xzWLFNmYNp8Waed6AO9--1" target="xzWLFNmYNp8Waed6AO9--3" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="xzWLFNmYNp8Waed6AO9--1" value="&lt;span style=&quot;font-weight: normal&quot;&gt;osr-string-exchange&lt;/span&gt;" style="whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
@@ -28,80 +28,89 @@
         <mxCell id="USxR0peUdslrmcRPEMfB-1" value="OSR-TEMPLATE" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-1940" y="-770" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-3" value="${PRODUCT}/templates/shared/body.md" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-3" value="${PRODUCT}/templates/shared/body.md" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1780" y="-860" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-4" value="${ROOT}/osr/bazar/root.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-4" value="${ROOT}/osr/bazar/root.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1780" y="-770" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-6" value="Platform.html" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-6" value="Platform.html" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-1940" y="-680" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-7" value="${PRODUCT}/bazar/out.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-7" value="${PRODUCT}/bazar/out.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1780" y="-680" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-10" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" edge="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-10" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" parent="1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-1970" y="-880" as="sourcePoint" />
             <mxPoint x="-1970" y="-330" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-11" value="TEXT" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-11" value="TEXT" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
           <mxGeometry x="-1960" y="-960" width="170" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-13" value="Assembly" style="whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-13" value="Assembly" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-860" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-16" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" edge="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-16" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" parent="1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-2250" y="-870" as="sourcePoint" />
             <mxPoint x="-2250" y="-320" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-17" value="Bom.xlsx" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-17" value="Bom.xlsx" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-770" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-18" value="${PRODUCT}/cad-${version}/Global*.SLASM" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-18" value="${PRODUCT}/cad-${version}/Global*.SLASM" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-860" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-19" value="${PRODUCT}/resources/bom.xlsx" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-19" value="${PRODUCT}/resources/bom.xlsx" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-770" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-22" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" edge="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-22" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;" parent="1" edge="1">
           <mxGeometry width="50" height="50" relative="1" as="geometry">
             <mxPoint x="-2420" y="-870" as="sourcePoint" />
             <mxPoint x="-2420" y="-320" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-23" value="CAD" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-23" value="CAD" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
           <mxGeometry x="-2420" y="-960" width="170" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-24" value="Global*.json" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-24" value="Config.json" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-690" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-25" value="${PRODUCT}/cad-${Version}/Global*.json" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-25" value="${PRODUCT}/cad-${Version}/Global*.json" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-690" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-26" value="Laser" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-26" value="Laser" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-600" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-27" value="${PRODUCT}/laser/${lang}/**/*.dxf" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-27" value="${PRODUCT}/laser/${lang}/**/*.dxf" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-600" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-29" value="STEP - File" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-29" value="STEP - File" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-510" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-30" value="${PRODUCT}/cad-${Version}/Global*.step" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-30" value="${PRODUCT}/cad-${Version}/Global*.step" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-510" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-31" value="HTML - File" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-31" value="3D Preview" style="whiteSpace=wrap;html=1;dashed=1;" parent="1" vertex="1">
           <mxGeometry x="-2400" y="-420" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-32" value="${PRODUCT}/cad-${Version}/Global*.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-32" value="${PRODUCT}/cad-${Version}/Global*.html" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-2240" y="-420" width="240" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="qWpWmjbH-HaDMDjgRYMk-34" value="OSR-Bundle" style="whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="-2395" y="-280" width="120" height="60" as="geometry" />
+        <mxCell id="qWpWmjbH-HaDMDjgRYMk-34" value="OSR-Bundle" style="whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="-2400" y="-80" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="4My7GARrOJwKCRgmLZeZ-1" value="Meta" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-2400" y="-340" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="4My7GARrOJwKCRgmLZeZ-2" value="Firmware" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-2400" y="-250" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="4My7GARrOJwKCRgmLZeZ-3" value="Assets" style="whiteSpace=wrap;html=1;dashed=1;" vertex="1" parent="1">
+          <mxGeometry x="-2400" y="-160" width="120" height="60" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/diagrams/product/product_data.drawio b/diagrams/product/product_data.drawio
index cf39252..cd31db1 100644
--- a/diagrams/product/product_data.drawio
+++ b/diagrams/product/product_data.drawio
@@ -1,54 +1,28 @@
-<mxfile host="Electron" modified="2023-09-06T06:11:24.603Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="hX38K8MOHfm7vqORT0E9" version="21.2.8" type="device">
+<mxfile host="Electron" modified="2024-07-07T20:07:20.297Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="IC92XWR8-WHSFWoB4XgM" version="21.2.8" type="device">
   <diagram id="07fea595-8f29-1299-0266-81d95cde20df" name="Page-1">
     <mxGraphModel dx="1418" dy="828" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" background="#ffffff" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="ZivSM6sEnkpAGvFioAeE-754" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-752" target="ZivSM6sEnkpAGvFioAeE-753" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="ZivSM6sEnkpAGvFioAeE-757" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" target="ZivSM6sEnkpAGvFioAeE-756" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="1270" y="310" as="sourcePoint" />
-            <Array as="points">
-              <mxPoint x="1270" y="380" />
-              <mxPoint x="1080" y="380" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="ZivSM6sEnkpAGvFioAeE-777" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-752" target="ZivSM6sEnkpAGvFioAeE-776" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1270" y="380" />
-              <mxPoint x="1687" y="380" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-800" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-752" target="ZivSM6sEnkpAGvFioAeE-799" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-803" value="1:n" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=17;" parent="ZivSM6sEnkpAGvFioAeE-800" vertex="1" connectable="0">
           <mxGeometry x="0.0571" y="3" relative="1" as="geometry">
-            <mxPoint x="5.000000000000001" y="13" as="offset" />
+            <mxPoint x="17" y="-3" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="AHbIbpmTOq7l3u5RPmye-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-752" target="AHbIbpmTOq7l3u5RPmye-7" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-752" value="Configuration" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="1210" y="250" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="AHbIbpmTOq7l3u5RPmye-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-753" target="AHbIbpmTOq7l3u5RPmye-1" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-753" value="Meta" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1210" y="430" width="120" height="60" as="geometry" />
+          <mxGeometry x="1370" y="352" width="96" height="49" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-783" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-756" target="ZivSM6sEnkpAGvFioAeE-782" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="510" />
-              <mxPoint x="680" y="510" />
+              <mxPoint x="1271" y="544" />
+              <mxPoint x="1021" y="544" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -56,127 +30,127 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-756" value="Assets" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="430" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="484" width="120" height="40" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-758" value="Drawings" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1320" y="670" width="120" height="60" as="geometry" />
+          <mxGeometry x="1511" y="704" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-760" value="Renderings" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1180" y="670" width="120" height="60" as="geometry" />
+          <mxGeometry x="1371" y="704" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-765" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-762" target="ZivSM6sEnkpAGvFioAeE-764" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="760" />
-              <mxPoint x="1080" y="760" />
+              <mxPoint x="1271" y="794" />
+              <mxPoint x="1271" y="794" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-773" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-762" target="ZivSM6sEnkpAGvFioAeE-772" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="750" />
-              <mxPoint x="1220" y="750" />
+              <mxPoint x="1271" y="784" />
+              <mxPoint x="1411" y="784" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-805" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=17;" parent="1" source="ZivSM6sEnkpAGvFioAeE-762" target="ZivSM6sEnkpAGvFioAeE-804" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="750" />
-              <mxPoint x="940" y="750" />
+              <mxPoint x="1271" y="784" />
+              <mxPoint x="1131" y="784" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="AHbIbpmTOq7l3u5RPmye-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-762" target="AHbIbpmTOq7l3u5RPmye-3" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="750" />
-              <mxPoint x="1360" y="750" />
+              <mxPoint x="1271" y="784" />
+              <mxPoint x="1551" y="784" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-762" value="Manufacturing" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="670" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="704" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-767" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-764" target="ZivSM6sEnkpAGvFioAeE-766" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-764" value="Laser" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="780" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="814" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-766" value="DXF" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="887" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="921" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-775" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-772" target="ZivSM6sEnkpAGvFioAeE-774" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-772" value="CNC" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1160" y="780" width="120" height="60" as="geometry" />
+          <mxGeometry x="1351" y="814" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-774" value="GCode/CAM" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1160" y="887" width="120" height="60" as="geometry" />
+          <mxGeometry x="1351" y="921" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-779" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-776" target="ZivSM6sEnkpAGvFioAeE-778" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1687" y="526" />
-              <mxPoint x="1547" y="526" />
+              <mxPoint x="1271" y="1136" />
+              <mxPoint x="1131" y="1136" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-781" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-776" target="ZivSM6sEnkpAGvFioAeE-780" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1687" y="516" />
-              <mxPoint x="1687" y="516" />
+              <mxPoint x="1271" y="1126" />
+              <mxPoint x="1271" y="1126" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-789" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-776" target="ZivSM6sEnkpAGvFioAeE-788" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1687" y="526" />
-              <mxPoint x="1827" y="526" />
+              <mxPoint x="1271" y="1136" />
+              <mxPoint x="1411" y="1136" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-776" value="Resources" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1627" y="430" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="1040" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-778" value="Forum" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1500" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="1084" y="1164" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-780" value="Wiki" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1637" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="1221" y="1164" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-785" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-782" target="ZivSM6sEnkpAGvFioAeE-784" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="680" y="650" />
-              <mxPoint x="610" y="650" />
+              <mxPoint x="1021" y="670" />
+              <mxPoint x="951" y="670" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-787" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-782" target="ZivSM6sEnkpAGvFioAeE-786" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="680" y="650" />
-              <mxPoint x="740" y="650" />
+              <mxPoint x="1021" y="670" />
+              <mxPoint x="1081" y="670" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-782" value="Media" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="620" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="961" y="574" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-784" value="Videos" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="550" y="670" width="120" height="60" as="geometry" />
+          <mxGeometry x="891" y="690" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-786" value="Pictures" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="690" y="670" width="120" height="60" as="geometry" />
+          <mxGeometry x="1031" y="690" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-788" value="Manuals" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1767" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="1351" y="1164" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-792" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-790" target="ZivSM6sEnkpAGvFioAeE-762" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -184,21 +158,21 @@
         <mxCell id="ZivSM6sEnkpAGvFioAeE-793" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-790" target="ZivSM6sEnkpAGvFioAeE-760" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="640" />
-              <mxPoint x="1240" y="640" />
+              <mxPoint x="1271" y="674" />
+              <mxPoint x="1431" y="674" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-794" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-790" target="ZivSM6sEnkpAGvFioAeE-758" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1080" y="640" />
-              <mxPoint x="1380" y="640" />
+              <mxPoint x="1271" y="674" />
+              <mxPoint x="1571" y="674" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-790" value="CAD" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1020" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="1211" y="588" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-797" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="ZivSM6sEnkpAGvFioAeE-796" target="ZivSM6sEnkpAGvFioAeE-752" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -208,41 +182,48 @@
             <mxPoint x="22" y="9" as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="AHbIbpmTOq7l3u5RPmye-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;" parent="1" source="ZivSM6sEnkpAGvFioAeE-796" target="AHbIbpmTOq7l3u5RPmye-9" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-796" value="Product / Component" style="rounded=0;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
           <mxGeometry x="960" y="250" width="120" height="60" as="geometry" />
         </mxCell>
+        <mxCell id="HY3RT6Ck-P-jrBNr7agx-4" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="ZivSM6sEnkpAGvFioAeE-799" target="ZivSM6sEnkpAGvFioAeE-753">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-799" value="Components" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1680" y="250" width="120" height="60" as="geometry" />
+          <mxGeometry x="1210" y="354" width="120" height="46" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-807" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=17;" parent="1" source="ZivSM6sEnkpAGvFioAeE-804" target="ZivSM6sEnkpAGvFioAeE-806" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-804" value="BOM" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="880" y="780" width="120" height="60" as="geometry" />
+          <mxGeometry x="1071" y="814" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="ZivSM6sEnkpAGvFioAeE-806" value="BOM" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="880" y="887" width="120" height="60" as="geometry" />
+          <mxGeometry x="1071" y="921" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="AHbIbpmTOq7l3u5RPmye-1" value="Compliance" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1210" y="554" width="120" height="60" as="geometry" />
+          <mxGeometry x="913" y="1167" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="AHbIbpmTOq7l3u5RPmye-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="AHbIbpmTOq7l3u5RPmye-3" target="AHbIbpmTOq7l3u5RPmye-5" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="AHbIbpmTOq7l3u5RPmye-3" value="Process" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1300" y="780" width="120" height="60" as="geometry" />
+          <mxGeometry x="1491" y="814" width="120" height="60" as="geometry" />
         </mxCell>
         <mxCell id="AHbIbpmTOq7l3u5RPmye-5" value="Sheets/..." style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1300" y="887" width="120" height="60" as="geometry" />
+          <mxGeometry x="1491" y="921" width="120" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="AHbIbpmTOq7l3u5RPmye-7" value="Defaults" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="1210" y="80" width="120" height="60" as="geometry" />
+        <mxCell id="HY3RT6Ck-P-jrBNr7agx-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="1270" y="774" as="targetPoint" />
+            <mxPoint x="990" y="818" as="sourcePoint" />
+            <Array as="points">
+              <mxPoint x="990" y="784" />
+              <mxPoint x="1271" y="784" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="AHbIbpmTOq7l3u5RPmye-9" value="Defaults" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="960" y="80" width="120" height="60" as="geometry" />
+        <mxCell id="HY3RT6Ck-P-jrBNr7agx-5" value="Firmware" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="930" y="814" width="120" height="60" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/diagrams/system/.$system-modules.drawio.bkp b/diagrams/system/.$system-modules.drawio.bkp
index 4a351bc..8419e84 100644
--- a/diagrams/system/.$system-modules.drawio.bkp
+++ b/diagrams/system/.$system-modules.drawio.bkp
@@ -1 +1,49 @@
-<mxfile host="Electron" modified="2022-08-03T05:11:25.808Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.7.9 Chrome/85.0.4183.121 Electron/10.1.3 Safari/537.36" etag="R2RtdD1M-G1tR_zqI28c" version="13.7.9" type="device"><diagram id="6UpJVxfaZ7YgvcYAvHzd" name="Page-1">7VvZcuI4FP0aqqYf6PISljwSstV0Z0KF1HTPvEwJS2ANsuWWZAj5+pGwjBcJQiYhSTd+CfhovfdK9xzJpOUPo4crBpLwhkJEWp4DH1r+ecvzXKfflR8KWWWI13E0MmMY6loFMMaPKG+q0RRDxCsVBaVE4KQKBjSOUSAqGGCMLqvVppRUR03ADBnAOADERL9hKEKNuo5TFFwjPAv10P2OLohAXlkDPASQLkuQf9Hyh4xSkX2LHoaIKO/lfsnaXW4p3UyMoVjs04D05z0HnD62Bw77fvaDdr/HoO35WTcLQFJtsZ6tWOUuYDSNIVK9OC3/bBligcYJCFTpUkZdYqGIiHxy5dcpjYWOotuTz+Ys9cQXiAn0UIL0rK8QjZBgK1lFl/od3USvobbr5d5fFiHpnWgsLEXDdXoaBXodzDbdF66SX7S3nuE51+K4LpHjngkwka7znAllELF1WfdHqsJ85hZfK7PflCvDOpVKgZxLAiDE8axS9aRSqwhXDurOB7Iw79XJ6uYOshRlU24HlBCQcJTV2TyVBuzO9Gdm8YTKDV4HmYGEKhAEz+LKTAO5NBDb3vskB27Hd+0bEIQ4lhlBF8rYTeoNJKaGMkFzRiYCtw4/AsFcZQvryE7mq7wQKD8zNK0YGgqhstZALTzvcobFZ8pZOyGACxx8pmwm0RKin6LC4pqDaqX5rIBhgWGlBdlYyehinXJtZlZs3NVtW9bToVLZH3EZdG6vdo8iabBAluLtiIqmEamXh/g2FUkqtiwu5ynzU1JHCM6RG8DmMv3HLW9Y6kMOUFQxG13f33zdv7bcHl93emxX49G5XJPObzxBAf+0s40ETUNfNx4QL7aGaEhjnkZPJgBLF7vCMxyc7+moHOEJiHPsitLZOuWPQ4Qqy6dc65mxeaGfFWhLywrPCCrHa3QvWTlLVhtO54LRORpSQhWbxVTuaUn0mJAaRCWnT8la46jSVlUNeJvBXqYG+k5NDbgWNeB2LWrA9w8mBvaQUSiGAyVIC39BwMO1rnKr/lb4CAhJivEa8Rx/E4VchHoW71KpyrBQfuk4u5yNYEXzmq4uObJj8WOOMSTzNl5UlbLNt3qEEcVyJrsiWVdrnKYsQLpdWdvWuip03va+BGAzJIy+1vHe2P6CJdAxloBMyBLIqBDH6oPClKjU9WpbLldTBE1VD2obYXl4GWg4whCqQayqvarrDyHczQB3zK3q2YS7d7Cd2m126st3aq+eSffdqL3Tp3p6vW3a5/NV+08aL87/+nc1P4XL7urv5thWFl5vd2y7ICgQDAdHdG5DJZMtBzdk8chHObmNgxBFMmGoyVkaPXFqk8VdECmGiSdcfVxiFi1lcnuOVc0Bz6xdPuAdz9HsSaubU9zPd4rr1HWA9RS3ued99VOcVRt4jTZ4D23wpbyqf3FRMJ+YTtngbyUDvsR0SdTRYgJ4Q8oNKf8PUr7Zl2gP7Z5flSCNI3e3a/Kj/ZbTORQ/mpecxQ3XOE0SykRzydXuuRYhc6g7LmucThod8x465hwzeaSnKoDHImdgyWSLqoEWjxxa3KRcBUwZm91BZH8lAoFQlhtzaoRPI3wa4fNhhI9xM2AVPv03FT7mq72GUN+AUK/pUtAjemMQ5va+9wVBwmiAuLr8hzSQOTQWQGAaN4zZMGbDmB+OMfvuPox5eijGdNx/ktEAPPTuprfTi2X0CMP75jX7+zDmGAEWhMfDmDy318KYvO6LD/N2XU/MYYinRPDMQe1Pz5nWT0evv49v/2io9f1ejWf+36vq3eDb2vHqB+Ejsv7l4lGSssHAFp7eTsp+jZQP+4JbPhb/SbYuK/1Dnn/xHw==</diagram></mxfile>
\ No newline at end of file
+<mxfile host="Electron" modified="2023-11-12T21:43:57.834Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="S5_M-suUCSk8FpkXvza-" version="21.2.8" type="device">
+  <diagram id="6UpJVxfaZ7YgvcYAvHzd" name="Page-1">
+    <mxGraphModel dx="1418" dy="2528" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="l8k70a9z-A0rXBqo6Xna-23" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=17;" parent="1" vertex="1">
+          <mxGeometry x="351" y="-1200" width="740" height="1070" as="geometry" />
+        </mxCell>
+        <mxCell id="l8k70a9z-A0rXBqo6Xna-1" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Machines&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-machines&quot;&gt;osr-machines&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: &lt;br&gt;&lt;br&gt;- Machine designs&lt;br&gt;- Templates&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;br&gt;&lt;/li&gt;&lt;li&gt;PDF (specs)&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;CAD&lt;/li&gt;&lt;li&gt;&lt;span&gt;Google Sheets&lt;/span&gt;&lt;br&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="380" y="-1100" width="160" height="330" as="geometry" />
+        </mxCell>
+        <mxCell id="l8k70a9z-A0rXBqo6Xna-13" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;fontSize=12;opacity=50;" parent="1" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="380" y="-1170" as="sourcePoint" />
+            <mxPoint x="1070" y="-1170" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="l8k70a9z-A0rXBqo6Xna-15" value="OSR - Main Modules" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=17;" parent="1" vertex="1">
+          <mxGeometry x="380" y="-1150" width="240" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="l8k70a9z-A0rXBqo6Xna-16" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;fontSize=12;opacity=50;" parent="1" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="380" y="-730" as="sourcePoint" />
+            <mxPoint x="790" y="-730" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="8sky-VonvDYjyk9dw6yZ-1" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Electrics&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-electrics&quot;&gt;osr-electrics&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: &lt;br&gt;&lt;br&gt;- Schematics &lt;br&gt;- Templates&lt;br&gt;-&amp;nbsp;Firmware&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;li&gt;CAD&lt;/li&gt;&lt;li&gt;&lt;span&gt;Google Sheets&lt;/span&gt;&lt;br&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="590" y="-1100" width="200" height="330" as="geometry" />
+        </mxCell>
+        <mxCell id="8sky-VonvDYjyk9dw6yZ-2" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-KB&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-kb&quot;&gt;osr-kb&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: Knowledgebase&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;MD&lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="380" y="-660" width="160" height="300" as="geometry" />
+        </mxCell>
+        <mxCell id="8sky-VonvDYjyk9dw6yZ-3" value="OSR - Support Modules" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=17;" parent="1" vertex="1">
+          <mxGeometry x="380" y="-710" width="240" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="8sky-VonvDYjyk9dw6yZ-4" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Directory&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-directory&quot;&gt;osr-directory&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: user &amp;amp; data directory&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;MD&lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="590" y="-660" width="180" height="300" as="geometry" />
+        </mxCell>
+        <mxCell id="8sky-VonvDYjyk9dw6yZ-5" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Howtos&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-howtos&quot;&gt;osr-kb&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: process documentation&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;MD&lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="810" y="-660" width="190" height="300" as="geometry" />
+        </mxCell>
+        <mxCell id="01_pPAax7RfOfEwmzdhT-1" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Search&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-search&quot;&gt;osr-search&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: &lt;br&gt;&lt;br&gt;- Search results :-)&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;JSON, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;li&gt;JSON&lt;/li&gt;&lt;li&gt;RAW / Plain&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
+          <mxGeometry x="830" y="-1100" width="200" height="330" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/diagrams/system/system-modules.drawio b/diagrams/system/system-modules.drawio
index 8419e84..098b856 100644
--- a/diagrams/system/system-modules.drawio
+++ b/diagrams/system/system-modules.drawio
@@ -1,4 +1,4 @@
-<mxfile host="Electron" modified="2023-11-12T21:43:57.834Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="S5_M-suUCSk8FpkXvza-" version="21.2.8" type="device">
+<mxfile host="Electron" modified="2024-07-07T20:10:49.584Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.2.8 Chrome/112.0.5615.165 Electron/24.2.0 Safari/537.36" etag="t9CLT47CxHPCAs1ZLDIx" version="21.2.8" type="device">
   <diagram id="6UpJVxfaZ7YgvcYAvHzd" name="Page-1">
     <mxGraphModel dx="1418" dy="2528" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" math="0" shadow="0">
       <root>
@@ -37,9 +37,6 @@
         <mxCell id="8sky-VonvDYjyk9dw6yZ-4" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Directory&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-directory&quot;&gt;osr-directory&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: user &amp;amp; data directory&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;MD&lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
           <mxGeometry x="590" y="-660" width="180" height="300" as="geometry" />
         </mxCell>
-        <mxCell id="8sky-VonvDYjyk9dw6yZ-5" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Howtos&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-howtos&quot;&gt;osr-kb&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: process documentation&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;Markdown, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;MD&lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
-          <mxGeometry x="810" y="-660" width="190" height="300" as="geometry" />
-        </mxCell>
         <mxCell id="01_pPAax7RfOfEwmzdhT-1" value="&lt;table border=&quot;1&quot; width=&quot;100%&quot; cellpadding=&quot;4&quot; style=&quot;width: 100% ; height: 100% ; border-collapse: collapse&quot;&gt;&lt;tbody&gt;&lt;tr&gt;&lt;th align=&quot;center&quot;&gt;&lt;b&gt;OSR-Search&lt;/b&gt;&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Package&lt;/b&gt; : &lt;a href=&quot;https://git.osr-plastic.org/osr-plastic/osr-search&quot;&gt;osr-search&lt;/a&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;Provides&lt;/b&gt;: &lt;br&gt;&lt;br&gt;- Search results :-)&lt;br&gt;&lt;br&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Outputs&lt;/b&gt; : &lt;br&gt;&lt;ul&gt;&lt;li&gt;JSON, &lt;/li&gt;&lt;li&gt;HTML &lt;/li&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;div&gt;&lt;b&gt;Consumes&lt;/b&gt;&lt;/div&gt;&lt;ul&gt;&lt;li&gt;OSRL&lt;/li&gt;&lt;li&gt;JSON&lt;/li&gt;&lt;li&gt;RAW / Plain&lt;/li&gt;&lt;/ul&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;" style="text;html=1;strokeColor=none;fillColor=none;overflow=fill;fontSize=12;" parent="1" vertex="1">
           <mxGeometry x="830" y="-1100" width="200" height="330" as="geometry" />
         </mxCell>