diff --git a/README.md b/README.md
index c1e1a545..29f5296b 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,58 @@ Simple. I wanted modern, crisp, pixel-perfect, printable, manufacturer independe
 ## Symbol overview
 ![alt text](https://github.com/ecceman/affinity/blob/master/affinity_index.png)
 
+New layout for diagrams packaging:
+
+    ├── device
+    │   ├── camera.svg
+    │   ├── camera_dome.svg
+    │   ├── client.svg
+    │   ├── printer.svg
+    │   ├── server-cluster.svg
+    │   ├── server.svg
+    │   └── tablet.svg
+    ├── devtools
+    │   ├── bug.svg
+    │   ├── conversation.svg
+    │   ├── fingerprint.svg
+    │   ├── inspect2.svg
+    │   ├── tree.svg
+    │   └── xml.svg
+    ├── general
+    │   ├── cog.svg
+    │   ├── communications.svg
+    │   ├── grid.svg
+    │   ├── grid2.svg
+    │   ├── link.svg
+    │   ├── pinpoint.svg
+    │   └── scull.svg
+    ├── identity
+    │   └── ldap.svg
+    ├── network
+    │   ├── cloud.svg
+    │   ├── dslam.svg
+    │   ├── firewall.svg
+    │   ├── hub.svg
+    │   ├── interconnect.svg
+    │   ├── isdn.svg
+    │   ├── loadbalancer.svg
+    │   ├── router.svg
+    │   ├── satellite.svg
+    │   ├── switch.svg
+    │   ├── switch_multilayer.svg
+    │   ├── rj45.svg
+    │   ├── wifi.svg
+    │   └── wlc.svg
+    ├── place
+    │   ├── house.svg
+    │   └── office.svg
+    ├── security
+    │   ├── padlock.svg
+    │   ├── padlock_open.svg
+    │   └── shield.svg
+    ├── storage
+    │   ├── flash.svg
+    │   ├── nas.svg
+    │   └── storage.svg
+    └── user
+        └── user.svg
diff --git a/svg/naked/camera.svg b/svg/naked/device/camera.svg
similarity index 100%
rename from svg/naked/camera.svg
rename to svg/naked/device/camera.svg
diff --git a/svg/naked/camera_dome.svg b/svg/naked/device/camera_dome.svg
similarity index 100%
rename from svg/naked/camera_dome.svg
rename to svg/naked/device/camera_dome.svg
diff --git a/svg/naked/device/camera_dome2.svg b/svg/naked/device/camera_dome2.svg
new file mode 100644
index 00000000..a6ea96e8
--- /dev/null
+++ b/svg/naked/device/camera_dome2.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100%"
+   height="100%"
+   viewBox="0 0 199 86"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
+   id="svg8"
+   sodipodi:docname="camera_dome2.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata14"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs12" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="702"
+   inkscape:window-height="480"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="2"
+   inkscape:cx="99.5"
+   inkscape:cy="43"
+   inkscape:window-x="78"
+   inkscape:window-y="27"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg8" />
+    <g
+   transform="matrix(1,0,0,-1,-50.8618,218.684)"
+   id="g6">
+        <path
+   d="m 241.138,156.703 h -29.669 c -3.93,30.435 -29.971,53.981 -61.469,53.981 -31.498,0 -57.539,-23.546 -61.469,-53.981 H 58.862 v -16 h 182.276 z"
+   style="fill:#ffffff"
+   id="path2" />
+        <path
+   d="m 241.138,156.703 h -29.669 l -0.048,0.356 -0.049,0.356 -0.051,0.355 -0.053,0.354 -0.055,0.354 -0.057,0.353 -0.059,0.352 -0.061,0.352 -0.063,0.351 -0.065,0.351 -0.067,0.349 -0.069,0.349 -0.071,0.349 -0.073,0.347 -0.075,0.347 -0.076,0.346 -0.079,0.346 -0.08,0.344 -0.083,0.344 -0.084,0.344 -0.087,0.342 -0.088,0.342 -0.09,0.341 -0.092,0.34 -0.094,0.339 -0.095,0.339 -0.098,0.338 -0.1,0.337 -0.101,0.336 -0.103,0.336 -0.105,0.334 -0.107,0.334 -0.109,0.333 -0.11,0.332 -0.112,0.332 -0.115,0.33 -0.116,0.33 -0.117,0.329 -0.12,0.328 -0.121,0.327 -0.123,0.326 -0.125,0.326 -0.127,0.324 -0.129,0.324 -0.13,0.322 -0.132,0.322 -0.134,0.321 -0.135,0.32 -0.137,0.319 -0.139,0.318 -0.141,0.317 -0.142,0.317 -0.144,0.315 -0.146,0.314 -0.148,0.314 -0.149,0.312 -0.151,0.312 -0.153,0.31 -0.154,0.31 -0.156,0.309 -0.157,0.307 -0.16,0.307 -0.161,0.305 -0.162,0.305 -0.164,0.304 -0.166,0.302 -0.168,0.302 -0.169,0.3 -0.171,0.3 -0.172,0.298 -0.174,0.297 -0.176,0.297 -0.177,0.295 -0.178,0.294 -0.181,0.293 -0.182,0.293 -0.183,0.291 -0.185,0.289 -0.187,0.289 -0.188,0.288 -0.19,0.286 -0.191,0.286 -0.193,0.284 -0.194,0.284 -0.196,0.282 -0.197,0.281 -0.199,0.279 -0.201,0.279 -0.201,0.278 -0.204,0.276 -0.205,0.275 -0.206,0.274 -0.208,0.273 -0.209,0.272 -0.211,0.27 -0.212,0.269 -0.214,0.268 -0.215,0.267 -0.216,0.266 -0.218,0.264 -0.22,0.264 -0.221,0.261 -0.222,0.261 -0.224,0.26 -0.225,0.258 -0.226,0.257 -0.228,0.256 -0.229,0.254 -0.231,0.253 -0.232,0.252 -0.233,0.251 -0.235,0.249 -0.236,0.248 -0.238,0.247 -0.238,0.245 -0.241,0.244 -0.241,0.243 -0.243,0.241 -0.244,0.24 -0.245,0.239 -0.247,0.238 -0.248,0.236 -0.25,0.234 -0.25,0.234 -0.252,0.232 -0.253,0.23 -0.255,0.229 -0.256,0.228 -0.257,0.227 -0.258,0.225 -0.259,0.223 -0.261,0.223 -0.262,0.22 -0.263,0.22 -0.265,0.218 -0.265,0.216 -0.267,0.215 -0.268,0.214 -0.27,0.212 -0.27,0.211 -0.272,0.209 -0.273,0.208 -0.274,0.206 -0.275,0.205 -0.276,0.203 -0.278,0.202 -0.279,0.2 -0.28,0.199 -0.281,0.198 -0.282,0.195 -0.283,0.195 -0.284,0.192 -0.286,0.192 -0.286,0.189 -0.288,0.188 -0.289,0.187 -0.29,0.185 -0.291,0.183 -0.292,0.182 -0.293,0.181 -0.294,0.178 -0.296,0.177 -0.296,0.176 -0.298,0.174 -0.298,0.172 -0.3,0.171 -0.3,0.169 -0.302,0.167 -0.302,0.166 -0.304,0.164 -0.305,0.163 -0.305,0.161 -0.307,0.159 -0.307,0.158 -0.309,0.156 -0.31,0.154 -0.31,0.152 -0.312,0.151 -0.312,0.149 -0.314,0.148 -0.314,0.146 -0.316,0.144 -0.316,0.142 -0.317,0.141 -0.318,0.139 -0.319,0.137 -0.32,0.135 -0.321,0.134 -0.322,0.132 -0.323,0.13 -0.323,0.128 -0.325,0.127 -0.325,0.125 -0.327,0.123 -0.327,0.121 -0.328,0.12 -0.329,0.118 -0.329,0.115 -0.331,0.115 -0.331,0.112 -0.332,0.11 -0.333,0.109 -0.334,0.107 -0.335,0.105 -0.336,0.103 -0.336,0.101 -0.337,0.1 -0.338,0.097 -0.338,0.096 -0.34,0.094 -0.34,0.091 -0.341,0.09 -0.342,0.089 -0.342,0.086 -0.344,0.084 -0.344,0.083 -0.344,0.08 -0.346,0.079 -0.346,0.076 -0.347,0.075 -0.348,0.073 -0.348,0.071 -0.349,0.069 -0.35,0.066 -0.35,0.065 -0.351,0.063 -0.352,0.061 -0.352,0.059 -0.354,0.057 -0.353,0.055 -0.355,0.053 -0.355,0.052 -0.356,0.049 -0.356,0.047 -0.357,0.044 -0.358,0.043 -0.358,0.041 -0.359,0.039 -0.359,0.037 -0.36,0.035 -0.361,0.032 -0.361,0.031 -0.362,0.029 -0.362,0.026 -0.363,0.025 -0.364,0.022 -0.364,0.02 -0.365,0.018 -0.365,0.016 -0.366,0.014 -0.366,0.012 -0.367,0.009 -0.367,0.008 -0.368,0.005 -0.368,0.004 -0.369,0.001 -0.369,-0.001 -0.368,-0.004 -0.368,-0.005 -0.367,-0.008 -0.367,-0.009 -0.366,-0.012 -0.366,-0.014 -0.365,-0.016 -0.365,-0.018 -0.364,-0.02 -0.364,-0.022 -0.363,-0.025 -0.362,-0.026 -0.362,-0.029 -0.361,-0.031 -0.361,-0.032 -0.36,-0.035 -0.359,-0.037 -0.359,-0.039 -0.358,-0.041 -0.358,-0.043 -0.357,-0.044 -0.356,-0.047 -0.356,-0.049 -0.355,-0.052 -0.355,-0.053 -0.353,-0.055 -0.354,-0.057 -0.352,-0.059 -0.352,-0.061 -0.351,-0.063 -0.35,-0.065 -0.35,-0.066 -0.349,-0.069 -0.348,-0.071 -0.348,-0.073 -0.347,-0.075 -0.346,-0.076 -0.346,-0.079 -0.344,-0.08 -0.344,-0.083 -0.344,-0.084 -0.342,-0.086 -0.342,-0.089 -0.341,-0.09 -0.34,-0.091 -0.34,-0.094 -0.338,-0.096 -0.338,-0.097 -0.337,-0.1 -0.336,-0.101 -0.336,-0.103 -0.335,-0.105 -0.334,-0.107 -0.333,-0.109 -0.332,-0.11 -0.331,-0.112 -0.331,-0.115 -0.329,-0.115 -0.329,-0.118 -0.328,-0.12 -0.327,-0.121 -0.327,-0.123 -0.325,-0.125 -0.325,-0.127 -0.323,-0.128 -0.323,-0.13 -0.322,-0.132 -0.321,-0.134 -0.32,-0.135 -0.319,-0.137 -0.318,-0.139 -0.317,-0.141 -0.316,-0.142 -0.316,-0.144 -0.314,-0.146 -0.314,-0.148 -0.312,-0.149 -0.312,-0.151 -0.31,-0.152 -0.31,-0.154 -0.309,-0.156 -0.307,-0.158 -0.307,-0.159 -0.305,-0.161 -0.305,-0.163 -0.304,-0.164 -0.302,-0.166 -0.302,-0.167 -0.3,-0.169 -0.3,-0.171 -0.298,-0.172 -0.298,-0.174 -0.296,-0.176 -0.296,-0.177 -0.294,-0.178 -0.293,-0.181 -0.292,-0.182 -0.291,-0.183 -0.29,-0.185 -0.289,-0.187 -0.288,-0.188 -0.286,-0.189 -0.286,-0.192 -0.284,-0.192 -0.283,-0.195 -0.282,-0.195 -0.281,-0.198 -0.28,-0.199 -0.279,-0.2 -0.278,-0.202 -0.276,-0.203 -0.275,-0.205 -0.274,-0.206 -0.273,-0.208 -0.272,-0.209 -0.27,-0.211 -0.27,-0.212 -0.268,-0.214 -0.267,-0.215 -0.265,-0.216 -0.265,-0.218 -0.263,-0.22 -0.262,-0.22 -0.261,-0.223 -0.259,-0.223 -0.258,-0.225 -0.257,-0.227 -0.256,-0.228 -0.255,-0.229 -0.253,-0.23 -0.252,-0.232 -0.25,-0.234 -0.25,-0.234 -0.248,-0.236 -0.247,-0.238 -0.245,-0.239 -0.244,-0.24 -0.243,-0.241 -0.241,-0.243 -0.241,-0.244 -0.238,-0.245 -0.238,-0.247 -0.236,-0.248 -0.235,-0.249 -0.233,-0.251 -0.232,-0.252 -0.231,-0.253 -0.229,-0.254 -0.228,-0.256 -0.226,-0.257 -0.225,-0.258 -0.224,-0.26 -0.222,-0.261 -0.221,-0.261 -0.22,-0.264 -0.218,-0.264 -0.216,-0.266 -0.215,-0.267 -0.214,-0.268 -0.212,-0.269 -0.211,-0.27 -0.209,-0.272 -0.208,-0.273 -0.206,-0.274 -0.205,-0.275 -0.204,-0.276 -0.201,-0.278 -0.201,-0.279 -0.199,-0.279 -0.197,-0.281 -0.196,-0.282 -0.194,-0.284 -0.193,-0.284 -0.191,-0.286 -0.19,-0.286 -0.188,-0.288 -0.187,-0.289 -0.185,-0.289 -0.183,-0.291 -0.182,-0.293 -0.181,-0.293 -0.178,-0.294 -0.177,-0.295 -0.176,-0.297 -0.174,-0.297 -0.172,-0.298 -0.171,-0.3 -0.169,-0.3 -0.168,-0.302 -0.166,-0.302 -0.164,-0.304 -0.162,-0.305 -0.161,-0.305 -0.16,-0.307 -0.157,-0.307 -0.156,-0.309 -0.154,-0.31 -0.153,-0.31 -0.151,-0.312 -0.149,-0.312 -0.148,-0.314 -0.146,-0.314 -0.144,-0.315 -0.142,-0.317 -0.141,-0.317 -0.139,-0.318 -0.137,-0.319 -0.135,-0.32 -0.134,-0.321 -0.132,-0.322 -0.13,-0.322 -0.129,-0.324 -0.127,-0.324 -0.125,-0.326 -0.123,-0.326 -0.121,-0.327 -0.12,-0.328 -0.117,-0.329 -0.116,-0.33 -0.115,-0.33 -0.112,-0.332 -0.11,-0.332 -0.109,-0.333 -0.107,-0.334 -0.105,-0.334 -0.103,-0.336 -0.101,-0.336 -0.1,-0.337 -0.098,-0.338 -0.095,-0.339 -0.094,-0.339 -0.092,-0.34 -0.09,-0.341 -0.088,-0.342 -0.087,-0.342 -0.084,-0.344 -0.083,-0.344 -0.08,-0.344 -0.079,-0.346 -0.076,-0.346 -0.075,-0.347 -0.073,-0.347 -0.071,-0.349 -0.069,-0.349 -0.067,-0.349 -0.065,-0.351 -0.063,-0.351 -0.061,-0.352 -0.059,-0.352 -0.057,-0.353 -0.055,-0.354 -0.053,-0.354 -0.051,-0.355 -0.049,-0.356 -0.048,-0.356 H 58.862 v -16 h 182.276 z m -136.426,0 0.008,0.05 0.047,0.26 0.048,0.26 0.05,0.259 0.051,0.258 0.052,0.258 0.054,0.257 0.056,0.257 0.056,0.256 0.059,0.255 0.059,0.256 0.061,0.254 0.063,0.254 0.063,0.253 0.066,0.253 0.066,0.252 0.068,0.252 0.07,0.251 0.071,0.251 0.072,0.25 0.073,0.249 0.075,0.248 0.077,0.249 0.077,0.247 0.079,0.247 0.081,0.246 0.082,0.246 0.083,0.245 0.084,0.245 0.086,0.244 0.087,0.243 0.089,0.243 0.089,0.242 0.091,0.241 0.093,0.241 0.094,0.24 0.095,0.239 0.096,0.239 0.098,0.238 0.099,0.238 0.1,0.237 0.102,0.236 0.103,0.236 0.104,0.235 0.105,0.234 0.107,0.233 0.108,0.233 0.109,0.232 0.111,0.232 0.112,0.231 0.113,0.23 0.114,0.229 0.115,0.229 0.117,0.228 0.118,0.227 0.12,0.226 0.12,0.226 0.122,0.225 0.123,0.225 0.124,0.223 0.126,0.223 0.126,0.222 0.128,0.222 0.129,0.22 0.13,0.22 0.132,0.219 0.132,0.219 0.134,0.217 0.135,0.217 0.136,0.216 0.138,0.215 0.138,0.214 0.14,0.214 0.141,0.213 0.142,0.212 0.143,0.211 0.144,0.21 0.146,0.21 0.147,0.209 0.147,0.207 0.149,0.207 0.15,0.207 0.151,0.205 0.152,0.204 0.154,0.204 0.154,0.203 0.156,0.202 0.156,0.201 0.158,0.2 0.159,0.199 0.16,0.199 0.161,0.197 0.162,0.196 0.163,0.196 0.164,0.195 0.166,0.194 0.166,0.193 0.167,0.192 0.169,0.191 0.169,0.19 0.171,0.189 0.171,0.189 0.173,0.187 0.173,0.186 0.175,0.186 0.175,0.184 0.177,0.184 0.178,0.182 0.178,0.182 0.18,0.18 0.18,0.18 0.182,0.178 0.183,0.178 0.183,0.177 0.185,0.175 0.185,0.175 0.186,0.173 0.188,0.173 0.188,0.171 0.189,0.171 0.191,0.169 0.191,0.168 0.192,0.168 0.193,0.166 0.194,0.165 0.194,0.164 0.196,0.164 0.197,0.162 0.197,0.161 0.199,0.159 0.199,0.159 0.2,0.158 0.201,0.157 0.202,0.155 0.203,0.154 0.203,0.154 0.205,0.152 0.205,0.151 0.206,0.15 0.208,0.149 0.207,0.148 0.209,0.146 0.21,0.146 0.21,0.144 0.211,0.143 0.212,0.142 0.213,0.141 0.214,0.139 0.214,0.139 0.215,0.137 0.216,0.136 0.217,0.135 0.218,0.134 0.218,0.133 0.219,0.131 0.22,0.13 0.221,0.129 0.221,0.128 0.222,0.127 0.223,0.125 0.224,0.124 0.224,0.123 0.225,0.122 0.226,0.121 0.227,0.119 0.227,0.118 0.228,0.117 0.229,0.115 0.229,0.114 0.23,0.113 0.231,0.112 0.231,0.111 0.233,0.109 0.232,0.108 0.234,0.107 0.234,0.105 0.235,0.104 0.236,0.103 0.236,0.102 0.237,0.1 0.237,0.099 0.239,0.097 0.238,0.097 0.24,0.095 0.24,0.094 0.241,0.092 0.241,0.091 0.242,0.09 0.243,0.088 0.243,0.087 0.244,0.086 0.245,0.085 0.245,0.083 0.246,0.081 0.246,0.081 0.247,0.079 0.247,0.077 0.249,0.077 0.248,0.074 0.25,0.074 0.25,0.072 0.25,0.071 0.251,0.069 0.252,0.068 0.252,0.067 0.253,0.065 0.253,0.064 0.254,0.062 0.255,0.061 0.255,0.06 0.256,0.058 0.256,0.057 0.257,0.055 0.257,0.054 0.258,0.052 0.258,0.051 0.259,0.05 0.259,0.048 0.26,0.047 0.261,0.045 0.261,0.043 0.262,0.043 0.262,0.04 0.263,0.04 0.263,0.038 0.263,0.036 0.265,0.035 0.264,0.033 0.266,0.032 0.266,0.03 0.266,0.029 0.267,0.028 0.267,0.025 0.268,0.025 0.268,0.022 0.269,0.022 0.27,0.019 0.27,0.018 0.27,0.017 0.271,0.015 0.271,0.014 0.272,0.011 0.273,0.011 0.273,0.009 0.273,0.007 0.274,0.005 0.275,0.004 0.274,0.003 0.276,0.001 0.276,-0.001 0.274,-0.003 0.275,-0.004 0.274,-0.005 0.273,-0.007 0.273,-0.009 0.273,-0.011 0.272,-0.011 0.271,-0.014 0.271,-0.015 0.27,-0.017 0.27,-0.018 0.27,-0.019 0.269,-0.022 0.268,-0.022 0.268,-0.025 0.267,-0.025 0.267,-0.028 0.266,-0.029 0.266,-0.03 0.266,-0.032 0.264,-0.033 0.265,-0.035 0.263,-0.036 0.263,-0.038 0.263,-0.04 0.262,-0.04 0.262,-0.043 0.261,-0.043 0.261,-0.045 0.26,-0.047 0.259,-0.048 0.259,-0.05 0.258,-0.051 0.258,-0.052 0.257,-0.054 0.257,-0.055 0.256,-0.057 0.256,-0.058 0.255,-0.06 0.255,-0.061 0.254,-0.062 0.253,-0.064 0.253,-0.065 0.252,-0.067 0.252,-0.068 0.251,-0.069 0.25,-0.071 0.25,-0.072 0.25,-0.074 0.248,-0.074 0.249,-0.077 0.247,-0.077 0.247,-0.079 0.246,-0.081 0.246,-0.081 0.245,-0.083 0.245,-0.085 0.244,-0.086 0.243,-0.087 0.243,-0.088 0.242,-0.09 0.241,-0.091 0.241,-0.092 0.24,-0.094 0.24,-0.095 0.238,-0.097 0.239,-0.097 0.237,-0.099 0.237,-0.1 0.236,-0.102 0.236,-0.103 0.235,-0.104 0.234,-0.105 0.234,-0.107 0.232,-0.108 0.233,-0.109 0.231,-0.111 0.231,-0.112 0.23,-0.113 0.23,-0.114 0.228,-0.115 0.228,-0.117 0.228,-0.118 0.226,-0.119 0.226,-0.121 0.225,-0.122 0.224,-0.123 0.224,-0.124 0.223,-0.125 0.222,-0.127 0.221,-0.128 0.221,-0.129 0.22,-0.13 0.219,-0.131 0.218,-0.133 0.218,-0.134 0.217,-0.135 0.216,-0.136 0.215,-0.137 0.214,-0.139 0.214,-0.139 0.213,-0.141 0.212,-0.142 0.211,-0.143 0.21,-0.144 0.21,-0.146 0.208,-0.146 0.208,-0.148 0.208,-0.149 0.206,-0.15 0.205,-0.151 0.205,-0.152 0.203,-0.154 0.203,-0.154 0.202,-0.155 0.201,-0.157 0.2,-0.158 0.2,-0.159 0.198,-0.159 0.197,-0.161 0.197,-0.162 0.196,-0.164 0.194,-0.164 0.194,-0.165 0.193,-0.166 0.192,-0.168 0.191,-0.168 0.191,-0.169 0.189,-0.171 0.188,-0.171 0.188,-0.173 0.186,-0.173 0.185,-0.175 0.185,-0.176 0.183,-0.176 0.183,-0.178 0.182,-0.178 0.18,-0.18 0.18,-0.18 0.178,-0.182 0.178,-0.182 0.177,-0.184 0.175,-0.184 0.175,-0.186 0.173,-0.186 0.173,-0.188 0.171,-0.188 0.171,-0.189 0.169,-0.19 0.169,-0.191 0.167,-0.192 0.166,-0.193 0.166,-0.194 0.164,-0.195 0.163,-0.195 0.162,-0.197 0.161,-0.197 0.16,-0.199 0.159,-0.199 0.158,-0.2 0.156,-0.201 0.156,-0.202 0.154,-0.203 0.154,-0.204 0.152,-0.204 0.151,-0.205 0.15,-0.206 0.149,-0.208 0.147,-0.207 0.147,-0.209 0.146,-0.21 0.144,-0.21 0.143,-0.211 0.142,-0.212 0.141,-0.213 0.14,-0.214 0.138,-0.214 0.138,-0.215 0.136,-0.216 0.135,-0.217 0.134,-0.217 0.132,-0.219 0.132,-0.219 0.13,-0.22 0.129,-0.22 0.128,-0.222 0.126,-0.222 0.126,-0.223 0.124,-0.223 0.123,-0.224 0.122,-0.226 0.12,-0.226 0.12,-0.226 0.118,-0.227 0.116,-0.228 0.116,-0.229 0.114,-0.229 0.113,-0.23 0.112,-0.231 0.111,-0.231 0.109,-0.233 0.108,-0.233 0.107,-0.233 0.105,-0.235 0.104,-0.234 0.103,-0.236 0.102,-0.236 0.1,-0.237 0.099,-0.237 0.098,-0.239 0.096,-0.239 0.095,-0.239 0.094,-0.24 0.093,-0.241 0.091,-0.242 0.089,-0.241 0.089,-0.243 0.087,-0.243 0.086,-0.244 0.084,-0.245 0.083,-0.245 0.082,-0.245 0.081,-0.247 0.079,-0.247 0.077,-0.247 0.077,-0.248 0.075,-0.249 0.073,-0.25 0.072,-0.249 0.071,-0.251 0.07,-0.251 0.068,-0.252 0.066,-0.252 0.065,-0.252 0.064,-0.254 0.063,-0.254 0.061,-0.255 0.059,-0.254 0.059,-0.256 0.056,-0.256 0.056,-0.257 0.054,-0.257 0.052,-0.258 0.051,-0.259 0.05,-0.258 0.048,-0.26 0.047,-0.26 0.008,-0.05 z"
+   style="fill:#4d4d4d"
+   id="path4" />
+    </g>
+</svg>
diff --git a/svg/naked/client.svg b/svg/naked/device/client.svg
similarity index 100%
rename from svg/naked/client.svg
rename to svg/naked/device/client.svg
diff --git a/svg/naked/device/gauge.svg b/svg/naked/device/gauge.svg
new file mode 100644
index 00000000..c4a60ac2
--- /dev/null
+++ b/svg/naked/device/gauge.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2876"
+   style="fill-rule:evenodd"
+   sodipodi:docname="gauge.svg"
+   xml:space="preserve"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   viewBox="0 0 100 100"
+   width="100"
+   height="100"><sodipodi:namedview
+   id="namedview2888"
+   bordercolor="#666666"
+   inkscape:pageshadow="2"
+   guidetolerance="10"
+   pagecolor="#ffffff"
+   gridtolerance="10"
+   inkscape:window-maximized="0"
+   inkscape:zoom="2.6641777"
+   objecttolerance="10"
+   borderopacity="1"
+   inkscape:current-layer="g3015"
+   inkscape:cx="30.755465"
+   inkscape:cy="46.023245"
+   inkscape:window-y="239"
+   inkscape:window-x="113"
+   inkscape:window-width="957"
+   showgrid="false"
+   inkscape:pageopacity="0"
+   inkscape:window-height="598" />
+ <defs
+   id="defs2878">
+  <style
+   id="style2880"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3672"
+   type="text/css">
+    .fil0 {fill:#0A0B0C}
+  </style>
+ <style
+   id="style3731"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3757"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3002"
+   type="text/css">
+    .fil0 {fill:white}
+    .fil1 {fill:black}
+  </style>
+ <style
+   id="style3027"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3076"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3133"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3182"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3223"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ <style
+   id="style3264"
+   type="text/css">
+    .str0 {stroke:#1F1A17;stroke-width:0.139357}
+    .fil0 {fill:none}
+    .fil1 {fill:#1F1A17}
+  </style>
+ <style
+   id="style3357"
+   type="text/css">
+    .fil1 {fill:black}
+    .fil0 {fill:white}
+  </style>
+ </defs>
+<g
+   id="g3015"
+   style="fill-rule:evenodd"
+   transform="matrix(1.0293,0,0,1.0293,-61.575,51.633467)"><g
+     id="g834"
+     transform="translate(0.10281138,-0.09906831)"
+     style="stroke:none;stroke-opacity:1;fill:#4d4d4d;fill-opacity:1"><path
+       inkscape:connector-curvature="0"
+       d="m 130.23701,16.921595 c 4.32606,-5.154959 6.70001,-11.6809634 6.70001,-18.4103801 0,-15.8162069 -12.82559,-28.6413669 -28.64137,-28.6413669 -15.816199,0 -28.641358,12.825602 -28.641358,28.6413669 0,6.7294167 2.373957,13.2554211 6.70001,18.4103801 l 1.343341,1.600989 -5.649783,4.741502 1.580339,1.882737 5.649782,-4.741502 -1.580338,-1.882737 -3.201979,2.686593 -1.343318,-1.600989 C 78.952762,14.603577 76.358368,8.4715741 75.66367,2.0253872 l -3.211265,0.2247045 -0.171595,-2.4526685 3.211264,-0.22470447 c -0.01127,-0.35305336 -0.01703,-0.70707953 -0.01703,-1.06159223 0,-8.4139813 3.169477,-16.0874975 8.377722,-21.8960305 l -2.318903,-2.239307 1.707692,-1.768649 2.319345,2.239748 c 5.623693,-5.403697 13.167205,-8.824123 21.50601,-9.131452 v -3.221657 h 2.45842 v 3.221657 c 8.33881,0.307307 15.88254,3.727534 21.50601,9.131452 l 2.31935,-2.239748 1.70769,1.768164 -2.3189,2.239748 c 5.20802,5.808532 8.37771,13.4820488 8.37771,21.8960303 0,0.3545127 -0.006,0.70853882 -0.0176,1.06159219 l 3.21127,0.22421807 -0.17157,2.45266854 -3.21127,-0.2242181 c -0.69483,6.4461868 -3.28914,12.578189 -7.48872,17.582801 l -1.34332,1.600989 2.44824,2.053847 -1.57985,1.88371 -5.65022,-4.740395 1.57985,-1.883711 1.34332,-1.600989 z"
+       style="fill:#4d4d4d;fill-rule:evenodd;stroke-width:2.21100569;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path3388" /><path
+       inkscape:connector-curvature="0"
+       d="m 98.785461,4.2237901 3.402069,3.5486639 4.26791,-4.7105473 c 0.66527,0.2689688 1.40036,0.3963006 2.16398,0.3456685 2.7034,-0.1789808 4.75079,-2.51700869 4.57147,-5.2204053 -0.0467,-0.7051117 -0.24093,-1.3654507 -0.54923,-1.9530475 l 13.04427,-14.3976264 -14.93358,12.4282837 c -0.81427,-0.4720275 -1.7731,-0.7159235 -2.78211,-0.6490407 -2.7034,0.178981 -4.75079,2.5170088 -4.57147,5.2204053 0.0305,0.46218862 0.12441,0.90571641 0.2724,1.32169501 L 98.785059,4.2236575 Z"
+       style="fill:#4d4d4d;fill-rule:evenodd;stroke-width:2.21100569;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path3386" /><path
+       inkscape:connector-curvature="0"
+       d="m 108.2961,-49.42492 c -26.473461,0 -47.937019,21.463557 -47.937019,47.9370193 0,26.4734617 21.463558,47.9370197 47.937019,47.9370197 26.47346,0 47.93702,-21.463558 47.93702,-47.9370197 0,-26.4734623 -21.46356,-47.9370193 -47.93702,-47.9370193 z m 0,7.364237 c 22.40062,0 40.57279,18.17216 40.57279,40.5727823 0,22.4006217 -18.17217,40.5727817 -40.57279,40.5727817 -22.400621,0 -40.572781,-18.17216 -40.572781,-40.5727817 0,-22.4006223 18.17216,-40.5727823 40.572781,-40.5727823 z"
+       style="fill:#4d4d4d;fill-rule:evenodd;stroke-width:1.11158311;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path3384" /></g></g><metadata
+   id="metadata20"><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
+         rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /><dc:publisher><cc:Agent
+           rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+         rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata></svg>
\ No newline at end of file
diff --git a/svg/naked/device/gpio_pins.svg b/svg/naked/device/gpio_pins.svg
new file mode 100644
index 00000000..4a8a36b6
--- /dev/null
+++ b/svg/naked/device/gpio_pins.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="68.956268"
+   height="97.825844"
+   viewBox="0 0 68.956268 97.825843"
+   version="1.1"
+   xml:space="preserve"
+   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="svg8"
+   sodipodi:docname="gpio_pins.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+   id="metadata14"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs12">
+        
+        
+    </defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1241"
+   inkscape:window-height="789"
+   id="namedview10"
+   showgrid="false"
+   inkscape:zoom="2.5276382"
+   inkscape:cx="4.1879749"
+   inkscape:cy="21.914738"
+   inkscape:window-x="78"
+   inkscape:window-y="27"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg8"
+   fit-margin-top="2"
+   fit-margin-left="2"
+   fit-margin-right="2"
+   fit-margin-bottom="2"
+   inkscape:document-rotation="0" />
+    
+<rect
+   style="fill:#4d4d4d;stroke:#4d4d4d;stroke-width:0.940193"
+   id="rect841"
+   width="92.742119"
+   height="30.40991"
+   x="2.4700966"
+   y="-32.880005"
+   transform="rotate(90)" /><rect
+   style="clip-rule:evenodd;fill:#4d4d4d;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.919053;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="rect841-3"
+   width="92.611671"
+   height="29.099699"
+   x="-95.366318"
+   y="37.397038"
+   transform="rotate(-90)" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-5"
+   cx="17.637442"
+   cy="20.217918"
+   r="11.176658" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-56"
+   cx="52.092083"
+   cy="19.924202"
+   r="11.176658" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-2"
+   cx="17.629847"
+   cy="77.687592"
+   r="11.176658" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-6-9"
+   cx="17.616442"
+   cy="48.533607"
+   r="11.176658" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-3-7"
+   cx="51.707745"
+   cy="48.606178"
+   r="11.176658" /><circle
+   style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.854291;stroke-linejoin:round;stroke-miterlimit:1.41421"
+   id="path865-56-0"
+   cx="51.713436"
+   cy="76.813652"
+   r="11.176658" /></svg>
diff --git a/svg/naked/device/gpio_pins2.svg b/svg/naked/device/gpio_pins2.svg
new file mode 100644
index 00000000..8f04b8b2
--- /dev/null
+++ b/svg/naked/device/gpio_pins2.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+   xml:space="preserve"
+   version="1.1"
+   viewBox="0 0 99.999999 70"
+   height="70"
+   width="100"><metadata
+   id="metadata14"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs12">
+        
+        
+    </defs>
+    
+<g
+   transform="matrix(0,1.0776476,-1.0658049,0,102.13163,-2.1552747)"
+   id="g830"><rect
+     style="fill:#4d4d4d;stroke:#4d4d4d;stroke-width:0.940193"
+     id="rect841"
+     width="92.742119"
+     height="30.40991"
+     x="2.4700966"
+     y="-32.880005"
+     transform="rotate(90)" /><rect
+     style="clip-rule:evenodd;fill:#4d4d4d;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.91905302;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="rect841-3"
+     width="92.611671"
+     height="29.099699"
+     x="-95.366318"
+     y="37.397038"
+     transform="rotate(-90)" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-5"
+     cx="17.637442"
+     cy="20.217918"
+     r="11.176658" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-56"
+     cx="52.092083"
+     cy="19.924202"
+     r="11.176658" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-2"
+     cx="17.629847"
+     cy="77.687592"
+     r="11.176658" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-6-9"
+     cx="17.616442"
+     cy="48.533607"
+     r="11.176658" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-3-7"
+     cx="51.707745"
+     cy="48.606178"
+     r="11.176658" /><circle
+     style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.85429102;stroke-linejoin:round;stroke-miterlimit:1.41420996"
+     id="path865-56-0"
+     cx="51.713436"
+     cy="76.813652"
+     r="11.176658" /></g></svg>
\ No newline at end of file
diff --git a/svg/naked/device/modem.svg b/svg/naked/device/modem.svg
new file mode 100644
index 00000000..b64d967e
--- /dev/null
+++ b/svg/naked/device/modem.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#474747"><path d="M11.105 10c-.781.648-1.68 1.518-3.065 2.01L1 12v3h14v-3l-2-2zm-.605 1.797a.7.7 0 01.703.703c0 .39-.314.703-.703.703a.702.702 0 01-.703-.703.7.7 0 01.703-.703zm2 .023a.679.679 0 110 1.36.678.678 0 01-.68-.68c0-.377.303-.68.68-.68z" style="marker:none" color="#000" overflow="visible"/><path d="M11.446 3.054c.328 0 .595.263.595.595v.039a7.37 7.37 0 01-7.37 7.35h-.019a.6.6 0 01-.595-.614V8.582c0-.34.274-.614.614-.614H5.9c.34 0 .614.274.614.614v.288a5.507 5.507 0 003.358-3.36h-.287a.613.613 0 01-.615-.614V3.669c0-.34.274-.615.615-.615h1.862z"/></g></svg>
\ No newline at end of file
diff --git a/svg/naked/printer.svg b/svg/naked/device/printer.svg
similarity index 100%
rename from svg/naked/printer.svg
rename to svg/naked/device/printer.svg
diff --git a/svg/naked/device/rtc.svg b/svg/naked/device/rtc.svg
new file mode 100644
index 00000000..d41f38dc
--- /dev/null
+++ b/svg/naked/device/rtc.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:docname="clock.svg"
+   viewBox="0 0 100 100"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="100"
+   height="100">
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     id="base"
+     fit-margin-left="0"
+     inkscape:zoom="3.0199483"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="47.360027"
+     inkscape:cy="57.177716"
+     inkscape:window-maximized="0"
+     showgrid="false"
+     fit-margin-right="0"
+     inkscape:snap-global="false"
+     inkscape:document-units="px"
+     bordercolor="#666666"
+     inkscape:window-x="292"
+     inkscape:window-y="97"
+     fit-margin-bottom="0"
+     inkscape:window-width="753"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     pagecolor="#ffffff"
+     inkscape:window-height="662"
+     fit-margin-top="0">
+    <inkscape:grid
+       id="grid3800"
+       enabled="true"
+       visible="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     transform="translate(-72.424,-660.52)">
+    <circle
+       id="path3755"
+       style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:3.78753757;fill-opacity:1;stroke-opacity:1"
+       cx="131.36455"
+       cy="701.57941"
+       r="38.707802" />
+    <path
+       id="path3757"
+       style="fill:none;stroke:#4d4d4d;stroke-width:3.35051394;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="M 94.072307,701.82987 H 108.63976" />
+    <path
+       id="path3759"
+       d="m 154.08977,701.82987 h 14.56745"
+       style="fill:none;stroke:#4d4d4d;stroke-width:3.35051394;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3761"
+       d="m 131.36455,664.24584 v 14.56745"
+       style="fill:none;stroke:#4d4d4d;stroke-width:3.35051394;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3763"
+       style="fill:none;stroke:#4d4d4d;stroke-width:3.35051394;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="M 131.36455,724.26374 V 738.8312" />
+    <path
+       id="path3765"
+       d="m 146.36465,727.55744 3.75462,6.50321"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3767"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 112.85951,669.22354 3.75462,6.5032" />
+    <path
+       id="path3769"
+       d="m 99.180675,682.78438 6.503205,3.75462"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3790"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 157.19701,716.39149 6.5032,3.75462" />
+    <path
+       id="path3792"
+       d="m 157.20575,686.82393 6.5032,-3.75461"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3794"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 98.988385,720.06977 6.503205,-3.75461" />
+    <path
+       id="path3796"
+       d="m 146.32823,675.81677 3.75462,-6.5032"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3798"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 112.77065,733.90448 3.75462,-6.5032" />
+    <path
+       id="path3802"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#4d4d4d;stroke-width:2.9134903;stroke-linecap:square;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 131.17808,701.68419 9.67716,-26.01455" />
+    <path
+       id="path3804"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#4d4d4d;stroke-width:3.35051394;stroke-linecap:square;stroke-miterlimit:0;fill-opacity:1;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 143.47738,709.98764 -12.07059,-8.3253" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 92.153741,744.29464 h 21.368649 v 10.59604 H 92.036003 v -2.29581 h -3.119936 v -6.12216 h 3.178805 z"
+       id="path5315"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1412"
+       transform="matrix(1.0666667,0,0,1.0666667,-354.14127,637.20258)"
+       style="fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1387"
+         d="m 403.17563,105.3657 h 7.43027"
+         style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.9375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1387-3"
+         d="m 406.89076,109.08083 v -7.43027"
+         style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:0.9375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 122.60009,749.59266 h 7.92562"
+       id="path1387-6"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:2.17223859;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1418"
+       width="0.060577337"
+       height="4.4665761"
+       x="89.489288"
+       y="747.34064" />
+  </g>
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>simple clock</dc:title>
+        <dc:date>2012-12-18T11:15:37</dc:date>
+        <dc:description>A simple clock pointing three past four.</dc:description>
+        <dc:source>https://openclipart.org/detail/173843/simple-clock-by-matzekatze-173843</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>matzekatze</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>day</rdf:li>
+            <rdf:li>hour</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>measure</rdf:li>
+            <rdf:li>minute</rdf:li>
+            <rdf:li>picto</rdf:li>
+            <rdf:li>pictogram</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>time</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/svg/naked/server-cluster.svg b/svg/naked/device/server-cluster.svg
similarity index 100%
rename from svg/naked/server-cluster.svg
rename to svg/naked/device/server-cluster.svg
diff --git a/svg/naked/server.svg b/svg/naked/device/server.svg
similarity index 100%
rename from svg/naked/server.svg
rename to svg/naked/device/server.svg
diff --git a/svg/naked/tablet.svg b/svg/naked/device/tablet.svg
similarity index 100%
rename from svg/naked/tablet.svg
rename to svg/naked/device/tablet.svg
diff --git a/svg/naked/device/wakeup.svg b/svg/naked/device/wakeup.svg
new file mode 100644
index 00000000..ff82d7c3
--- /dev/null
+++ b/svg/naked/device/wakeup.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="alarm_clock"
+   x="0px"
+   y="0px"
+   width="80"
+   height="100"
+   viewBox="0 0 80 100"
+   enable-background="new 0 0 164 209"
+   xml:space="preserve"
+   sodipodi:docname="alarm.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata891"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs889" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="937"
+   inkscape:window-height="830"
+   id="namedview887"
+   showgrid="false"
+   inkscape:zoom="1.1291866"
+   inkscape:cx="-92.990544"
+   inkscape:cy="99.332"
+   inkscape:window-x="207"
+   inkscape:window-y="28"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="alarm_clock" />
+<g
+   id="g884"
+   transform="matrix(0.50172979,0,0,0.50172979,-2.1329451,-1.2374349)"
+   style="stroke:#4d4d4d;stroke-opacity:1;stroke-width:1.00053856;stroke-miterlimit:4;stroke-dasharray:none;fill:#4d4d4d;fill-opacity:1">
+	<path
+   d="m 87.385,57.346 c -2.336,0 -4.227,1.894 -4.227,4.226 v 52.854 l -32.041,22.615 c -1.911,1.346 -2.356,3.979 -1.015,5.877 0.83,1.18 2.129,1.799 3.458,1.799 0.846,0 1.692,-0.247 2.435,-0.783 l 33.833,-23.879 c 1.114,-0.801 1.783,-2.08 1.783,-3.45 V 61.571 c 0,-2.34 -1.89,-4.225 -4.226,-4.225"
+   id="path876"
+   inkscape:connector-curvature="0"
+   style="stroke:#4d4d4d;stroke-opacity:1;stroke-width:1.00053856;stroke-miterlimit:4;stroke-dasharray:none;fill:#4d4d4d;fill-opacity:1" />
+	<path
+   d="m 158.385,112.906 c 0,-41.504 -33.767,-75.271 -75.268,-75.271 -41.509,0 -75.275,33.767 -75.275,75.271 0,23.723 11.057,44.877 28.257,58.686 L 20.962,197.46 c -1.177,2.014 -0.5,4.605 1.514,5.794 0.665,0.388 1.403,0.569 2.129,0.569 1.453,0 2.864,-0.751 3.648,-2.088 l 14.774,-25.232 c 11.622,7.354 25.348,11.679 40.098,11.679 14.741,0 28.459,-4.316 40.081,-11.67 l 14.766,25.231 c 0.784,1.337 2.204,2.089 3.648,2.089 0.727,0 1.461,-0.182 2.138,-0.57 2.015,-1.188 2.69,-3.764 1.511,-5.794 l -15.138,-25.859 c 17.185,-13.818 28.254,-34.98 28.254,-58.703 m -75.276,66.816 c -36.841,0 -66.824,-29.97 -66.824,-66.815 0,-36.841 29.974,-66.819 66.824,-66.819 36.854,0 66.815,29.97 66.815,66.819 0.001,36.853 -29.961,66.815 -66.815,66.815"
+   id="path878"
+   inkscape:connector-curvature="0"
+   style="stroke:#4d4d4d;stroke-opacity:1;stroke-width:1.00053856;stroke-miterlimit:4;stroke-dasharray:none;fill:#4d4d4d;fill-opacity:1" />
+	<path
+   d="m 13.294,53.169 c 0.718,0 1.444,-0.177 2.113,-0.565 l 47.22,-27.267 c 0.966,-0.557 1.676,-1.478 1.965,-2.559 0.285,-1.085 0.14,-2.241 -0.425,-3.207 C 55.479,4.529 36.19,-0.634 21.155,8.045 13.871,12.255 8.663,19.039 6.484,27.165 4.31,35.295 5.428,43.78 9.625,51.056 c 0.788,1.362 2.208,2.113 3.669,2.113 m 1.353,-23.816 c 1.589,-5.943 5.41,-10.912 10.734,-13.99 3.615,-2.084 7.572,-3.083 11.477,-3.083 6.62,0 13.091,2.848 17.54,8.048 L 15.163,42.976 C 13.624,38.634 13.43,33.917 14.647,29.353"
+   id="path880"
+   inkscape:connector-curvature="0"
+   style="stroke:#4d4d4d;stroke-opacity:1;stroke-width:1.00053856;stroke-miterlimit:4;stroke-dasharray:none;fill:#4d4d4d;fill-opacity:1" />
+	<path
+   d="m 103.785,25.345 47.221,27.267 c 0.652,0.371 1.379,0.565 2.113,0.565 0.363,0 0.734,-0.049 1.098,-0.144 1.081,-0.289 2.006,-0.999 2.559,-1.969 4.209,-7.288 5.324,-15.773 3.152,-23.895 -2.179,-8.122 -7.387,-14.919 -14.666,-19.116 -15.047,-8.683 -34.345,-3.516 -43.02,11.527 -0.554,0.974 -0.719,2.121 -0.43,3.202 0.29,1.073 0.991,1.998 1.973,2.563 m 37.242,-9.983 c 9.739,5.629 13.833,17.362 10.21,27.613 L 111.998,20.322 c 7.073,-8.249 19.281,-10.589 29.029,-4.96"
+   id="path882"
+   inkscape:connector-curvature="0"
+   style="stroke:#4d4d4d;stroke-opacity:1;stroke-width:1.00053856;stroke-miterlimit:4;stroke-dasharray:none;fill:#4d4d4d;fill-opacity:1" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/svg/naked/bug.svg b/svg/naked/devtools/bug.svg
similarity index 100%
rename from svg/naked/bug.svg
rename to svg/naked/devtools/bug.svg
diff --git a/svg/naked/conversation.svg b/svg/naked/devtools/conversation.svg
similarity index 100%
rename from svg/naked/conversation.svg
rename to svg/naked/devtools/conversation.svg
diff --git a/svg/naked/fingerprint.svg b/svg/naked/devtools/fingerprint.svg
similarity index 100%
rename from svg/naked/fingerprint.svg
rename to svg/naked/devtools/fingerprint.svg
diff --git a/svg/naked/inspect2.svg b/svg/naked/devtools/inspect2.svg
similarity index 100%
rename from svg/naked/inspect2.svg
rename to svg/naked/devtools/inspect2.svg
diff --git a/svg/naked/tree.svg b/svg/naked/devtools/tree.svg
similarity index 100%
rename from svg/naked/tree.svg
rename to svg/naked/devtools/tree.svg
diff --git a/svg/naked/xml.svg b/svg/naked/devtools/xml.svg
similarity index 100%
rename from svg/naked/xml.svg
rename to svg/naked/devtools/xml.svg
diff --git a/svg/naked/cog.svg b/svg/naked/general/cog.svg
similarity index 100%
rename from svg/naked/cog.svg
rename to svg/naked/general/cog.svg
diff --git a/svg/naked/communications.svg b/svg/naked/general/communications.svg
similarity index 100%
rename from svg/naked/communications.svg
rename to svg/naked/general/communications.svg
diff --git a/svg/naked/grid.svg b/svg/naked/general/grid.svg
similarity index 100%
rename from svg/naked/grid.svg
rename to svg/naked/general/grid.svg
diff --git a/svg/naked/grid2.svg b/svg/naked/general/grid2.svg
similarity index 100%
rename from svg/naked/grid2.svg
rename to svg/naked/general/grid2.svg
diff --git a/svg/naked/link.svg b/svg/naked/general/link.svg
similarity index 100%
rename from svg/naked/link.svg
rename to svg/naked/general/link.svg
diff --git a/svg/naked/pinpoint.svg b/svg/naked/general/pinpoint.svg
similarity index 100%
rename from svg/naked/pinpoint.svg
rename to svg/naked/general/pinpoint.svg
diff --git a/svg/naked/scull.svg b/svg/naked/general/scull.svg
similarity index 100%
rename from svg/naked/scull.svg
rename to svg/naked/general/scull.svg
diff --git a/svg/naked/ldap.svg b/svg/naked/identity/ldap.svg
similarity index 100%
rename from svg/naked/ldap.svg
rename to svg/naked/identity/ldap.svg
diff --git a/svg/naked/cloud.svg b/svg/naked/network/cloud.svg
similarity index 100%
rename from svg/naked/cloud.svg
rename to svg/naked/network/cloud.svg
diff --git a/svg/naked/dslam.svg b/svg/naked/network/dslam.svg
similarity index 100%
rename from svg/naked/dslam.svg
rename to svg/naked/network/dslam.svg
diff --git a/svg/naked/firewall.svg b/svg/naked/network/firewall.svg
similarity index 100%
rename from svg/naked/firewall.svg
rename to svg/naked/network/firewall.svg
diff --git a/svg/naked/hub.svg b/svg/naked/network/hub.svg
similarity index 100%
rename from svg/naked/hub.svg
rename to svg/naked/network/hub.svg
diff --git a/svg/naked/interconnect.svg b/svg/naked/network/interconnect.svg
similarity index 100%
rename from svg/naked/interconnect.svg
rename to svg/naked/network/interconnect.svg
diff --git a/svg/naked/isdn.svg b/svg/naked/network/isdn.svg
similarity index 100%
rename from svg/naked/isdn.svg
rename to svg/naked/network/isdn.svg
diff --git a/svg/naked/loadbalancer.svg b/svg/naked/network/loadbalancer.svg
similarity index 100%
rename from svg/naked/loadbalancer.svg
rename to svg/naked/network/loadbalancer.svg
diff --git a/svg/naked/tj45.svg b/svg/naked/network/rj45.svg
similarity index 100%
rename from svg/naked/tj45.svg
rename to svg/naked/network/rj45.svg
diff --git a/svg/naked/router.svg b/svg/naked/network/router.svg
similarity index 100%
rename from svg/naked/router.svg
rename to svg/naked/network/router.svg
diff --git a/svg/naked/satellite.svg b/svg/naked/network/satellite.svg
similarity index 100%
rename from svg/naked/satellite.svg
rename to svg/naked/network/satellite.svg
diff --git a/svg/naked/switch.svg b/svg/naked/network/switch.svg
similarity index 100%
rename from svg/naked/switch.svg
rename to svg/naked/network/switch.svg
diff --git a/svg/naked/switch_multilayer.svg b/svg/naked/network/switch_multilayer.svg
similarity index 100%
rename from svg/naked/switch_multilayer.svg
rename to svg/naked/network/switch_multilayer.svg
diff --git a/svg/naked/wifi.svg b/svg/naked/network/wifi.svg
similarity index 100%
rename from svg/naked/wifi.svg
rename to svg/naked/network/wifi.svg
diff --git a/svg/naked/wlc.svg b/svg/naked/network/wlc.svg
similarity index 100%
rename from svg/naked/wlc.svg
rename to svg/naked/network/wlc.svg
diff --git a/svg/naked/house.svg b/svg/naked/place/house.svg
similarity index 100%
rename from svg/naked/house.svg
rename to svg/naked/place/house.svg
diff --git a/svg/naked/office.svg b/svg/naked/place/office.svg
similarity index 100%
rename from svg/naked/office.svg
rename to svg/naked/place/office.svg
diff --git a/svg/naked/padlock.svg b/svg/naked/security/padlock.svg
similarity index 100%
rename from svg/naked/padlock.svg
rename to svg/naked/security/padlock.svg
diff --git a/svg/naked/padlock_open.svg b/svg/naked/security/padlock_open.svg
similarity index 100%
rename from svg/naked/padlock_open.svg
rename to svg/naked/security/padlock_open.svg
diff --git a/svg/naked/shield.svg b/svg/naked/security/shield.svg
similarity index 100%
rename from svg/naked/shield.svg
rename to svg/naked/security/shield.svg
diff --git a/svg/naked/storage/flash.svg b/svg/naked/storage/flash.svg
new file mode 100644
index 00000000..7435ca22
--- /dev/null
+++ b/svg/naked/storage/flash.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="46.727818"
+   height="36.890381"
+   viewBox="0 0 46.727817 36.890381"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="flash.svg"
+   version="1.0"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /><dc:creator><cc:Agent><dc:title>Luca Ferretti &lt;elle.uca@libero.it&gt;</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>media flash removable</rdf:li></rdf:Bag></dc:subject><dc:description>A flash removable media, such as SD</dc:description><cc:license
+         rdf:resource="http://creativecommons.org/licenses/LGPL/2.1/" /></cc:Work><cc:License
+       rdf:about="http://creativecommons.org/licenses/LGPL/2.1/"><cc:permits
+         rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+         rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+         rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><defs
+   id="defs23">
+		
+	
+			
+			
+			
+			
+			
+			
+		</defs><sodipodi:namedview
+   inkscape:window-height="946"
+   inkscape:window-width="1270"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="true"
+   inkscape:grid-bbox="true"
+   inkscape:grid-points="true"
+   inkscape:zoom="15.108773"
+   inkscape:cx="23.363909"
+   inkscape:cy="18.44519"
+   inkscape:window-x="205"
+   inkscape:window-y="51"
+   inkscape:current-layer="svg2"
+   inkscape:document-rotation="0"
+   inkscape:window-maximized="0"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+	<path
+   style="fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:#4d4d4d;stroke-width:7.41129;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 3.7726381,3.6868878 V 28.391179 l 4.940857,4.940858 H 43.299503 V 3.6868878 Z"
+   id="path9"
+   sodipodi:nodetypes="cccccc" />
+	
+<path
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.816329px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 41.773478,25.07808 v 6.530645 l -5.714315,-3.265322 z"
+   id="path2776" /><path
+   style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.3307;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 3.3692231,26.000493 H 14.275224"
+   id="path4548"
+   sodipodi:nodetypes="cc" /><path
+   id="path5435"
+   d="M 3.3402684,19.403102 H 14.24627"
+   style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.3307;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.3307;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 3.3268485,12.993884 H 14.232849"
+   id="path5437"
+   sodipodi:nodetypes="cc" /><path
+   id="path5439"
+   d="M 3.40797,6.5622883 H 14.313971"
+   style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.3307;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   sodipodi:nodetypes="cc" /></svg>
diff --git a/svg/naked/nas.svg b/svg/naked/storage/nas.svg
similarity index 100%
rename from svg/naked/nas.svg
rename to svg/naked/storage/nas.svg
diff --git a/svg/naked/storage.svg b/svg/naked/storage/storage.svg
similarity index 100%
rename from svg/naked/storage.svg
rename to svg/naked/storage/storage.svg
diff --git a/svg/naked/user.svg b/svg/naked/user/user.svg
similarity index 100%
rename from svg/naked/user.svg
rename to svg/naked/user/user.svg