diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icon-acer.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icon-acer.svg
similarity index 99%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icon-acer.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icon-acer.svg
index 4914b84606..b719b696d2 100644
--- a/datamodels/2.x/itop-config-mgmt/asset/img/icon-acer.svg
+++ b/datamodels/2.x/itop-config-mgmt/assets/img/icon-acer.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg:svg
+<svg
    version="1.1"
    id="acer"
    x="0px"
@@ -40,4 +40,4 @@
    id="acer-logo"
    style="fill:#80c343"
    d="m 82.85,32.760893 c -0.29,-0.42 -0.62,-0.7 -2.04,-0.81 -0.37,-0.03 -1.6,-0.07 -3.66,-0.07 -5.42,0 -9.1,1.65 -10.98,4.91 0.52,-3.28 -2.67,-4.92 -9.55,-4.92 -8.09,0 -13.14,3.27 -15.15,9.81 -0.74,1.91 -0.82,4.02 -0.23,5.98 l -1.91,0.13 c -1.49,0.11 -3.46,0.22 -4.66,0.22 -2.96,0 -4.8,-0.5 -5.51,-1.5 -0.64,-0.9 -0.57,-2.56 0.17,-4.98 1.23,-4.02 4.29,-5.82 9.18,-5.82 2.53,0 5,0.27 5,0.27 0.3,-0.05 0.51,-0.33 0.46,-0.64 0,-0.01 0,-0.02 -0.01,-0.03 l -0.05,-0.38 -0.17,-1.35 c -0.11,-0.89 -0.77,-1.41 -1.97,-1.57 -1.1,-0.07 -1.91,-0.13 -3.12,-0.13 h -0.07 c -6.39,0.01 -10.84,2.12 -13.36,6.32 0.92,-4.21 -2.04,-6.32 -8.87,-6.32 -2.73,-0.05 -5.46,0.06 -8.18,0.33 -1.03,-0.03 -1.96,0.61 -2.33,1.57 l -0.54,1.73 c -0.1,0.32 0.05,0.48 0.46,0.48 h 0.01 c 0.3,-0.04 1.46,-0.15 3.44,-0.31 2.62,-0.21 4.55,-0.32 5.83,-0.32 3.77,0 5.35,0.95 4.76,2.84 -0.11,0.4 -0.44,0.71 -0.85,0.78 -3.56,0.59 -6.39,1.02 -8.48,1.28 -5.89,0.75 -9.29,2.59 -10.2,5.52 -1.25,4.03 1.89,6.04 9.44,6.04 3.17,0.04 6.34,-0.18 9.48,-0.65 1.47,-0.25 2.22,-0.63 2.51,-1.58 l 1.41,-4.49 c -0.15,4.49 2.99,6.75 9.41,6.75 2.23,0.04 4.45,-0.06 6.66,-0.31 1.32,-0.23 1.95,-0.52 2.24,-1.51 l 0.28,-1.41 c 1.37,2.14 4.37,3.21 9.01,3.21 4.89,0 7.74,-0.14 8.55,-0.41 0.57,-0.12 1.04,-0.52 1.25,-1.06 0.03,-0.09 0.05,-0.19 0.06,-0.28 l 0.59,-1.91 c 0.1,-0.33 -0.05,-0.49 -0.45,-0.48 l -3.13,0.15 c -2.09,0.12 -3.72,0.18 -4.9,0.17 -1.54,0.08 -3.08,-0.07 -4.58,-0.46 -1.2,-0.41 -1.94,-1.61 -1.77,-2.86 l 9.91,-1.27 c 4.44,-0.57 7.42,-1.94 8.92,-4.12 l -3.37,11.73 c -0.07,0.18 -0.04,0.38 0.07,0.53 0.18,0.17 0.41,0.25 0.65,0.22 h 4.1 c 0.47,0.07 0.93,-0.22 1.06,-0.68 l 3.62,-12.67 c 0.48,-1.67 2,-2.48 4.67,-2.48 2.41,0 4.22,0.02 5.38,0.07 0.03,0 0.06,0 0.09,0 0.39,0 0.74,-0.26 0.84,-0.63 l 0.63,-1.74 c 0.15,-0.3 0.12,-0.63 -0.05,-0.89 m -66.12,15.24 c -1.83,0.23 -3.68,0.33 -5.52,0.3 -4.17,0 -5.99,-0.84 -5.46,-2.53 0.38,-1.21 1.47,-1.94 3.28,-2.19 l 9.48,-1.28 z m 43.83,-10.27 c -0.4,1.3 -2.25,2.19 -5.56,2.67 l -7.9,1.13 0.2,-0.65 c 0.39,-1.74 1.37,-3.28 2.79,-4.37 1.2,-0.77 3.15,-1.16 5.86,-1.16 3.56,0 5.1,0.8 4.61,2.38" />
-<script /></svg:svg>
+</svg>
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icon-cisco.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icon-cisco.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icon-cisco.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icon-cisco.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icon-hpe.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icon-hpe.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icon-hpe.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icon-hpe.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icon-oracle-linux.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icon-oracle-linux.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icon-oracle-linux.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icon-oracle-linux.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icon-sony.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icon-sony.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icon-sony.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icon-sony.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-acess-point.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-acess-point.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-acess-point.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-acess-point.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-arch-linux.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-arch-linux.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-arch-linux.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-arch-linux.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-asus.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-asus.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-asus.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-asus.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-debian.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-debian.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-debian.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-debian.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-dell.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-dell.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-dell.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-dell.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-firewall.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-firewall.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-firewall.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-firewall.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-hp.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-hp.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-hp.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-hp.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-ibm.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-ibm.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-ibm.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-ibm.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-lenovo.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-lenovo.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-lenovo.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-lenovo.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-loadbalancer.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-loadbalancer.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-loadbalancer.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-loadbalancer.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-mac-os.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-mac-os.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-mac-os.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-mac-os.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-razer.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-razer.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-razer.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-razer.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-red-hat.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-red-hat.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-red-hat.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-red-hat.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-router-4g.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-router-4g.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-router-4g.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-router-4g.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-router.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-router.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-router.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-router.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-samsung.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-samsung.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-samsung.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-samsung.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-ubuntu.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-ubuntu.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-ubuntu.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-ubuntu.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-windows-server.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-windows-server.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-windows-server.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-windows-server.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/icons8-windows.svg b/datamodels/2.x/itop-config-mgmt/assets/img/icons8-windows.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/icons8-windows.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/icons8-windows.svg
diff --git a/datamodels/2.x/itop-config-mgmt/asset/img/logo-toshiba.svg b/datamodels/2.x/itop-config-mgmt/assets/img/logo-toshiba.svg
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/asset/img/logo-toshiba.svg
rename to datamodels/2.x/itop-config-mgmt/assets/img/logo-toshiba.svg