diff --git a/chronos-exporter/files/site-plans/freemont/floor-0.svg b/chronos-exporter/files/site-plans/freemont/floor-0.svg
index bf6e33a..a300d8d 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-0.svg
+++ b/chronos-exporter/files/site-plans/freemont/floor-0.svg
@@ -1,8 +1,6 @@
-<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
-
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
+<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -22,55 +20,7 @@
    inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
    sodipodi:docname="floor-0.svg">
   <title
-     id="title952">Floor Plan sample - floor-1</title>
-  <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4711">
-      <stop
-         style="stop-color:#f61616;stop-opacity:0.86764705"
-         offset="0"
-         id="stop4707" />
-      <stop
-         style="stop-color:#9494ed;stop-opacity:0"
-         offset="1"
-         id="stop4709" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,-151.07922,-5.6639515)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-8"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,-1.7175641,-68.399635)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4711"
-       id="radialGradient4713-2-7"
-       cx="113.68472"
-       cy="86.872292"
-       fx="113.68472"
-       fy="86.872292"
-       r="50.583138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4214875,0,0,1.4214875,27.374166,9.4661793)" />
-  </defs>
+     id="title952">Floor Plan sample - floor-0</title>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -82,7 +32,7 @@
      inkscape:cx="344.08776"
      inkscape:cy="410.25296"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer6"
+     inkscape:current-layer="layerStructure"
      showgrid="true"
      width="300mm"
      objecttolerance="10000"
@@ -116,8 +66,8 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Walls"
+     id="layerStructure"
+     inkscape:label="Structure"
      style="display:inline">
     <rect
        style="opacity:1;fill:none;fill-opacity:0.86764706;stroke:#000000;stroke-width:0.2763854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -186,55 +136,7 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SmallCells"
-     style="display:inline">
-    <circle
-       r="5.2916665"
-       cy="55.214973"
-       cx="160.36127"
-       id="circle4540-4"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="132.91795"
-       cx="189.02284"
-       id="circle4540-8"
-       style="display:inline;fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <circle
-       r="5.2916665"
-       cy="117.6014"
-       cx="10.83964"
-       id="circle4540"
-       style="fill:#62b800;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:groupmode="layer"
-       id="layer5"
-       inkscape:label="Beam"
-       style="display:inline">
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9"
-         cx="10.522173"
-         cy="117.82392"
-         r="71.90329" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-8);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-7"
-         cx="159.8838"
-         cy="55.088234"
-         r="71.90329" />
-      <circle
-         style="display:inline;fill:url(#radialGradient4713-2-7);fill-opacity:1;stroke:none;stroke-width:0.71074373;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4694-9-3"
-         cx="188.97557"
-         cy="132.95406"
-         r="71.90329" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
+     id="layerText"
      inkscape:label="Text"
      style="display:inline">
     <text
@@ -353,170 +255,4 @@
          x="271.57532"
          y="139.47122">WC (F)</tspan></text>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Devices"
-     style="display:inline">
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8"
-       sodipodi:sides="5"
-       sodipodi:cx="23.780182"
-       sodipodi:cy="80.43219"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 23.780182,75.140523 1.555182,3.151143 3.477492,0.505309 -2.516337,2.452822 0.594026,3.463441 -3.110363,-1.635215 -3.110364,1.635215 0.594027,-3.463441 -2.516337,-2.452822 3.477492,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-8"
-       sodipodi:sides="5"
-       sodipodi:cx="76.729164"
-       sodipodi:cy="120.625"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 76.729164,115.33333 1.555182,3.15115 3.477492,0.50531 -2.516337,2.45282 0.594027,3.46344 -3.110364,-1.63522 -3.110364,1.63522 0.594027,-3.46344 -2.516337,-2.45283 3.477492,-0.5053 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-3"
-       sodipodi:sides="5"
-       sodipodi:cx="125.90935"
-       sodipodi:cy="98.953024"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 125.90935,93.661358 1.55518,3.151142 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463439 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.463438 -2.51634,-2.452823 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-1"
-       sodipodi:sides="5"
-       sodipodi:cx="142.7455"
-       sodipodi:cy="98.640724"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 142.7455,93.349058 1.55518,3.151142 3.47749,0.505309 -2.51633,2.452823 0.59402,3.463438 -3.11036,-1.63521 -3.11036,1.63521 0.59402,-3.463438 -2.51634,-2.452823 3.4775,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-89"
-       sodipodi:sides="5"
-       sodipodi:cx="104.74268"
-       sodipodi:cy="22.223858"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 104.74268,16.932191 1.55519,3.151143 3.47749,0.505309 -2.51634,2.452822 0.59403,3.463441 -3.11037,-1.635215 -3.11036,1.635215 0.59403,-3.463441 -2.51634,-2.452822 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-6"
-       sodipodi:sides="5"
-       sodipodi:cx="206.5045"
-       sodipodi:cy="21.911558"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 206.5045,16.619892 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452823 0.59402,3.46344 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-4"
-       sodipodi:sides="5"
-       sodipodi:cx="230.317"
-       sodipodi:cy="21.911558"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 230.317,16.619892 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452823 0.59402,3.46344 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-33"
-       sodipodi:sides="5"
-       sodipodi:cx="230.317"
-       sodipodi:cy="85.41156"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 230.317,80.119894 1.55518,3.151142 3.4775,0.505309 -2.51634,2.452822 0.59402,3.463441 -3.11036,-1.635215 -3.11036,1.635215 0.59402,-3.46344 -2.51633,-2.452823 3.47749,-0.505309 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-38"
-       sodipodi:sides="5"
-       sodipodi:cx="193.14583"
-       sodipodi:cy="165.60417"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 193.14583,160.31251 1.55518,3.15114 3.47749,0.50531 -2.51633,2.45282 0.59402,3.46344 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.4775,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-    <path
-       sodipodi:type="star"
-       style="display:inline;fill:#9aa9ee;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4550-8-60"
-       sodipodi:sides="5"
-       sodipodi:cx="243.54616"
-       sodipodi:cy="178.01573"
-       sodipodi:r1="5.2916665"
-       sodipodi:r2="2.6458333"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.9424778"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 243.54616,172.72407 1.55518,3.15114 3.47749,0.50531 -2.51634,2.45282 0.59403,3.46344 -3.11036,-1.63521 -3.11037,1.63521 0.59403,-3.46344 -2.51634,-2.45282 3.4775,-0.50531 z"
-       inkscape:transform-center-y="-0.50530945" />
-  </g>
 </svg>