diff --git a/nodes/analysis/72-sentiment.html b/nodes/core/analysis/72-sentiment.html
similarity index 100%
rename from nodes/analysis/72-sentiment.html
rename to nodes/core/analysis/72-sentiment.html
diff --git a/nodes/analysis/72-sentiment.js b/nodes/core/analysis/72-sentiment.js
similarity index 100%
rename from nodes/analysis/72-sentiment.js
rename to nodes/core/analysis/72-sentiment.js
diff --git a/nodes/analysis/73-parsexml.html b/nodes/core/analysis/73-parsexml.html
similarity index 100%
rename from nodes/analysis/73-parsexml.html
rename to nodes/core/analysis/73-parsexml.html
diff --git a/nodes/analysis/73-parsexml.js b/nodes/core/analysis/73-parsexml.js
similarity index 100%
rename from nodes/analysis/73-parsexml.js
rename to nodes/core/analysis/73-parsexml.js
diff --git a/nodes/analysis/74-js2xml.html b/nodes/core/analysis/74-js2xml.html
similarity index 100%
rename from nodes/analysis/74-js2xml.html
rename to nodes/core/analysis/74-js2xml.html
diff --git a/nodes/analysis/74-js2xml.js b/nodes/core/analysis/74-js2xml.js
similarity index 100%
rename from nodes/analysis/74-js2xml.js
rename to nodes/core/analysis/74-js2xml.js
diff --git a/nodes/core/20-inject.html b/nodes/core/core/20-inject.html
similarity index 100%
rename from nodes/core/20-inject.html
rename to nodes/core/core/20-inject.html
diff --git a/nodes/core/20-inject.js b/nodes/core/core/20-inject.js
similarity index 100%
rename from nodes/core/20-inject.js
rename to nodes/core/core/20-inject.js
diff --git a/nodes/core/58-debug.html b/nodes/core/core/58-debug.html
similarity index 100%
rename from nodes/core/58-debug.html
rename to nodes/core/core/58-debug.html
diff --git a/nodes/core/58-debug.js b/nodes/core/core/58-debug.js
similarity index 100%
rename from nodes/core/58-debug.js
rename to nodes/core/core/58-debug.js
diff --git a/nodes/core/75-exec.html b/nodes/core/core/75-exec.html
similarity index 100%
rename from nodes/core/75-exec.html
rename to nodes/core/core/75-exec.html
diff --git a/nodes/core/75-exec.js b/nodes/core/core/75-exec.js
similarity index 100%
rename from nodes/core/75-exec.js
rename to nodes/core/core/75-exec.js
diff --git a/nodes/core/80-function.html b/nodes/core/core/80-function.html
similarity index 100%
rename from nodes/core/80-function.html
rename to nodes/core/core/80-function.html
diff --git a/nodes/core/80-function.js b/nodes/core/core/80-function.js
similarity index 100%
rename from nodes/core/80-function.js
rename to nodes/core/core/80-function.js
diff --git a/nodes/core/80-template.html b/nodes/core/core/80-template.html
similarity index 100%
rename from nodes/core/80-template.html
rename to nodes/core/core/80-template.html
diff --git a/nodes/core/80-template.js b/nodes/core/core/80-template.js
similarity index 100%
rename from nodes/core/80-template.js
rename to nodes/core/core/80-template.js
diff --git a/nodes/core/89-delay.html b/nodes/core/core/89-delay.html
similarity index 100%
rename from nodes/core/89-delay.html
rename to nodes/core/core/89-delay.html
diff --git a/nodes/core/89-delay.js b/nodes/core/core/89-delay.js
similarity index 100%
rename from nodes/core/89-delay.js
rename to nodes/core/core/89-delay.js
diff --git a/nodes/core/90-comment.html b/nodes/core/core/90-comment.html
similarity index 100%
rename from nodes/core/90-comment.html
rename to nodes/core/core/90-comment.html
diff --git a/nodes/core/90-comment.js b/nodes/core/core/90-comment.js
similarity index 100%
rename from nodes/core/90-comment.js
rename to nodes/core/core/90-comment.js
diff --git a/nodes/deprecated/30-socketin.html b/nodes/core/deprecated/30-socketin.html
similarity index 100%
rename from nodes/deprecated/30-socketin.html
rename to nodes/core/deprecated/30-socketin.html
diff --git a/nodes/deprecated/30-socketin.js b/nodes/core/deprecated/30-socketin.js
similarity index 100%
rename from nodes/deprecated/30-socketin.js
rename to nodes/core/deprecated/30-socketin.js
diff --git a/nodes/deprecated/30-socketout.html b/nodes/core/deprecated/30-socketout.html
similarity index 100%
rename from nodes/deprecated/30-socketout.html
rename to nodes/core/deprecated/30-socketout.html
diff --git a/nodes/deprecated/30-socketout.js b/nodes/core/deprecated/30-socketout.js
similarity index 100%
rename from nodes/deprecated/30-socketout.js
rename to nodes/core/deprecated/30-socketout.js
diff --git a/nodes/deprecated/32-multicast.html b/nodes/core/deprecated/32-multicast.html
similarity index 100%
rename from nodes/deprecated/32-multicast.html
rename to nodes/core/deprecated/32-multicast.html
diff --git a/nodes/deprecated/32-multicast.js b/nodes/core/deprecated/32-multicast.js
similarity index 100%
rename from nodes/deprecated/32-multicast.js
rename to nodes/core/deprecated/32-multicast.js
diff --git a/nodes/deprecated/35-rpi-gpio-in.html b/nodes/core/deprecated/35-rpi-gpio-in.html
similarity index 100%
rename from nodes/deprecated/35-rpi-gpio-in.html
rename to nodes/core/deprecated/35-rpi-gpio-in.html
diff --git a/nodes/deprecated/35-rpi-gpio-in.js b/nodes/core/deprecated/35-rpi-gpio-in.js
similarity index 100%
rename from nodes/deprecated/35-rpi-gpio-in.js
rename to nodes/core/deprecated/35-rpi-gpio-in.js
diff --git a/nodes/deprecated/35-rpi-gpio-out.html b/nodes/core/deprecated/35-rpi-gpio-out.html
similarity index 100%
rename from nodes/deprecated/35-rpi-gpio-out.html
rename to nodes/core/deprecated/35-rpi-gpio-out.html
diff --git a/nodes/deprecated/35-rpi-gpio-out.js b/nodes/core/deprecated/35-rpi-gpio-out.js
similarity index 100%
rename from nodes/deprecated/35-rpi-gpio-out.js
rename to nodes/core/deprecated/35-rpi-gpio-out.js
diff --git a/nodes/hardware/35-arduino.html b/nodes/core/hardware/35-arduino.html
similarity index 100%
rename from nodes/hardware/35-arduino.html
rename to nodes/core/hardware/35-arduino.html
diff --git a/nodes/hardware/35-arduino.js b/nodes/core/hardware/35-arduino.js
similarity index 100%
rename from nodes/hardware/35-arduino.js
rename to nodes/core/hardware/35-arduino.js
diff --git a/nodes/hardware/36-rpi-gpio.html b/nodes/core/hardware/36-rpi-gpio.html
similarity index 100%
rename from nodes/hardware/36-rpi-gpio.html
rename to nodes/core/hardware/36-rpi-gpio.html
diff --git a/nodes/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
similarity index 100%
rename from nodes/hardware/36-rpi-gpio.js
rename to nodes/core/hardware/36-rpi-gpio.js
diff --git a/nodes/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
similarity index 100%
rename from nodes/io/10-mqtt.html
rename to nodes/core/io/10-mqtt.html
diff --git a/nodes/io/10-mqtt.js b/nodes/core/io/10-mqtt.js
similarity index 100%
rename from nodes/io/10-mqtt.js
rename to nodes/core/io/10-mqtt.js
diff --git a/nodes/io/21-httpin.html b/nodes/core/io/21-httpin.html
similarity index 100%
rename from nodes/io/21-httpin.html
rename to nodes/core/io/21-httpin.html
diff --git a/nodes/io/21-httpin.js b/nodes/core/io/21-httpin.js
similarity index 100%
rename from nodes/io/21-httpin.js
rename to nodes/core/io/21-httpin.js
diff --git a/nodes/io/23-watch.html b/nodes/core/io/23-watch.html
similarity index 100%
rename from nodes/io/23-watch.html
rename to nodes/core/io/23-watch.html
diff --git a/nodes/io/23-watch.js b/nodes/core/io/23-watch.js
similarity index 100%
rename from nodes/io/23-watch.js
rename to nodes/core/io/23-watch.js
diff --git a/nodes/io/25-serial.html b/nodes/core/io/25-serial.html
similarity index 100%
rename from nodes/io/25-serial.html
rename to nodes/core/io/25-serial.html
diff --git a/nodes/io/25-serial.js b/nodes/core/io/25-serial.js
similarity index 100%
rename from nodes/io/25-serial.js
rename to nodes/core/io/25-serial.js
diff --git a/nodes/io/31-tcpin.html b/nodes/core/io/31-tcpin.html
similarity index 100%
rename from nodes/io/31-tcpin.html
rename to nodes/core/io/31-tcpin.html
diff --git a/nodes/io/31-tcpin.js b/nodes/core/io/31-tcpin.js
similarity index 100%
rename from nodes/io/31-tcpin.js
rename to nodes/core/io/31-tcpin.js
diff --git a/nodes/io/32-udp.html b/nodes/core/io/32-udp.html
similarity index 100%
rename from nodes/io/32-udp.html
rename to nodes/core/io/32-udp.html
diff --git a/nodes/io/32-udp.js b/nodes/core/io/32-udp.js
similarity index 100%
rename from nodes/io/32-udp.js
rename to nodes/core/io/32-udp.js
diff --git a/nodes/io/90-httpget.html b/nodes/core/io/90-httpget.html
similarity index 100%
rename from nodes/io/90-httpget.html
rename to nodes/core/io/90-httpget.html
diff --git a/nodes/io/90-httpget.js b/nodes/core/io/90-httpget.js
similarity index 100%
rename from nodes/io/90-httpget.js
rename to nodes/core/io/90-httpget.js
diff --git a/nodes/io/lib/mqtt.js b/nodes/core/io/lib/mqtt.js
similarity index 100%
rename from nodes/io/lib/mqtt.js
rename to nodes/core/io/lib/mqtt.js
diff --git a/nodes/io/lib/mqttConnectionPool.js b/nodes/core/io/lib/mqttConnectionPool.js
similarity index 100%
rename from nodes/io/lib/mqttConnectionPool.js
rename to nodes/core/io/lib/mqttConnectionPool.js
diff --git a/nodes/logic/10-switch.html b/nodes/core/logic/10-switch.html
similarity index 100%
rename from nodes/logic/10-switch.html
rename to nodes/core/logic/10-switch.html
diff --git a/nodes/logic/10-switch.js b/nodes/core/logic/10-switch.js
similarity index 100%
rename from nodes/logic/10-switch.js
rename to nodes/core/logic/10-switch.js
diff --git a/nodes/social/27-twitter.html b/nodes/core/social/27-twitter.html
similarity index 100%
rename from nodes/social/27-twitter.html
rename to nodes/core/social/27-twitter.html
diff --git a/nodes/social/27-twitter.js b/nodes/core/social/27-twitter.js
similarity index 100%
rename from nodes/social/27-twitter.js
rename to nodes/core/social/27-twitter.js
diff --git a/nodes/social/32-feedparse.html b/nodes/core/social/32-feedparse.html
similarity index 100%
rename from nodes/social/32-feedparse.html
rename to nodes/core/social/32-feedparse.html
diff --git a/nodes/social/32-feedparse.js b/nodes/core/social/32-feedparse.js
similarity index 100%
rename from nodes/social/32-feedparse.js
rename to nodes/core/social/32-feedparse.js
diff --git a/nodes/social/61-email.html b/nodes/core/social/61-email.html
similarity index 100%
rename from nodes/social/61-email.html
rename to nodes/core/social/61-email.html
diff --git a/nodes/social/61-email.js b/nodes/core/social/61-email.js
similarity index 100%
rename from nodes/social/61-email.js
rename to nodes/core/social/61-email.js
diff --git a/nodes/social/61-imap.html b/nodes/core/social/61-imap.html
similarity index 100%
rename from nodes/social/61-imap.html
rename to nodes/core/social/61-imap.html
diff --git a/nodes/social/61-imap.js b/nodes/core/social/61-imap.js
similarity index 100%
rename from nodes/social/61-imap.js
rename to nodes/core/social/61-imap.js
diff --git a/nodes/social/91-irc.html b/nodes/core/social/91-irc.html
similarity index 100%
rename from nodes/social/91-irc.html
rename to nodes/core/social/91-irc.html
diff --git a/nodes/social/91-irc.js b/nodes/core/social/91-irc.js
similarity index 100%
rename from nodes/social/91-irc.js
rename to nodes/core/social/91-irc.js
diff --git a/nodes/storage/28-tail.html b/nodes/core/storage/28-tail.html
similarity index 100%
rename from nodes/storage/28-tail.html
rename to nodes/core/storage/28-tail.html
diff --git a/nodes/storage/28-tail.js b/nodes/core/storage/28-tail.js
similarity index 100%
rename from nodes/storage/28-tail.js
rename to nodes/core/storage/28-tail.js
diff --git a/nodes/storage/50-file.html b/nodes/core/storage/50-file.html
similarity index 100%
rename from nodes/storage/50-file.html
rename to nodes/core/storage/50-file.html
diff --git a/nodes/storage/50-file.js b/nodes/core/storage/50-file.js
similarity index 100%
rename from nodes/storage/50-file.js
rename to nodes/core/storage/50-file.js
diff --git a/nodes/storage/65-redisout.html b/nodes/core/storage/65-redisout.html
similarity index 100%
rename from nodes/storage/65-redisout.html
rename to nodes/core/storage/65-redisout.html
diff --git a/nodes/storage/65-redisout.js b/nodes/core/storage/65-redisout.js
similarity index 100%
rename from nodes/storage/65-redisout.js
rename to nodes/core/storage/65-redisout.js
diff --git a/nodes/storage/66-mongodb.html b/nodes/core/storage/66-mongodb.html
similarity index 100%
rename from nodes/storage/66-mongodb.html
rename to nodes/core/storage/66-mongodb.html
diff --git a/nodes/storage/66-mongodb.js b/nodes/core/storage/66-mongodb.js
similarity index 100%
rename from nodes/storage/66-mongodb.js
rename to nodes/core/storage/66-mongodb.js