diff --git a/examples/er-rest-example/Makefile b/examples/ipv6/er-rest-example/Makefile
similarity index 98%
rename from examples/er-rest-example/Makefile
rename to examples/ipv6/er-rest-example/Makefile
index c8009dfa752b6474c06866c9927a7deb37d7e8f3..a2350ac20b871dbb0d0ec1c15d71d86c239b5d15 100644
--- a/examples/er-rest-example/Makefile
+++ b/examples/ipv6/er-rest-example/Makefile
@@ -1,7 +1,7 @@
 all: er-example-server er-example-client
 # use target "er-plugtest-server" explicitly when requried
 
-CONTIKI=../..
+CONTIKI=../../..
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
diff --git a/examples/er-rest-example/README.md b/examples/ipv6/er-rest-example/README.md
similarity index 100%
rename from examples/er-rest-example/README.md
rename to examples/ipv6/er-rest-example/README.md
diff --git a/examples/er-rest-example/er-example-client.c b/examples/ipv6/er-rest-example/er-example-client.c
similarity index 100%
rename from examples/er-rest-example/er-example-client.c
rename to examples/ipv6/er-rest-example/er-example-client.c
diff --git a/examples/er-rest-example/er-example-observe-client.c b/examples/ipv6/er-rest-example/er-example-observe-client.c
similarity index 100%
rename from examples/er-rest-example/er-example-observe-client.c
rename to examples/ipv6/er-rest-example/er-example-observe-client.c
diff --git a/examples/er-rest-example/er-example-server.c b/examples/ipv6/er-rest-example/er-example-server.c
similarity index 100%
rename from examples/er-rest-example/er-example-server.c
rename to examples/ipv6/er-rest-example/er-example-server.c
diff --git a/examples/er-rest-example/er-plugtest-server.c b/examples/ipv6/er-rest-example/er-plugtest-server.c
similarity index 100%
rename from examples/er-rest-example/er-plugtest-server.c
rename to examples/ipv6/er-rest-example/er-plugtest-server.c
diff --git a/examples/er-rest-example/er-plugtest.h b/examples/ipv6/er-rest-example/er-plugtest.h
similarity index 100%
rename from examples/er-rest-example/er-plugtest.h
rename to examples/ipv6/er-rest-example/er-plugtest.h
diff --git a/examples/er-rest-example/in6addr.patch b/examples/ipv6/er-rest-example/in6addr.patch
similarity index 100%
rename from examples/er-rest-example/in6addr.patch
rename to examples/ipv6/er-rest-example/in6addr.patch
diff --git a/examples/er-rest-example/project-conf.h b/examples/ipv6/er-rest-example/project-conf.h
similarity index 100%
rename from examples/er-rest-example/project-conf.h
rename to examples/ipv6/er-rest-example/project-conf.h
diff --git a/examples/er-rest-example/resources/res-b1-sep-b2.c b/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
similarity index 100%
rename from examples/er-rest-example/resources/res-b1-sep-b2.c
rename to examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
diff --git a/examples/er-rest-example/resources/res-battery.c b/examples/ipv6/er-rest-example/resources/res-battery.c
similarity index 100%
rename from examples/er-rest-example/resources/res-battery.c
rename to examples/ipv6/er-rest-example/resources/res-battery.c
diff --git a/examples/er-rest-example/resources/res-chunks.c b/examples/ipv6/er-rest-example/resources/res-chunks.c
similarity index 100%
rename from examples/er-rest-example/resources/res-chunks.c
rename to examples/ipv6/er-rest-example/resources/res-chunks.c
diff --git a/examples/er-rest-example/resources/res-event.c b/examples/ipv6/er-rest-example/resources/res-event.c
similarity index 100%
rename from examples/er-rest-example/resources/res-event.c
rename to examples/ipv6/er-rest-example/resources/res-event.c
diff --git a/examples/er-rest-example/resources/res-hello.c b/examples/ipv6/er-rest-example/resources/res-hello.c
similarity index 100%
rename from examples/er-rest-example/resources/res-hello.c
rename to examples/ipv6/er-rest-example/resources/res-hello.c
diff --git a/examples/er-rest-example/resources/res-leds.c b/examples/ipv6/er-rest-example/resources/res-leds.c
similarity index 100%
rename from examples/er-rest-example/resources/res-leds.c
rename to examples/ipv6/er-rest-example/resources/res-leds.c
diff --git a/examples/er-rest-example/resources/res-light.c b/examples/ipv6/er-rest-example/resources/res-light.c
similarity index 100%
rename from examples/er-rest-example/resources/res-light.c
rename to examples/ipv6/er-rest-example/resources/res-light.c
diff --git a/examples/er-rest-example/resources/res-mirror.c b/examples/ipv6/er-rest-example/resources/res-mirror.c
similarity index 100%
rename from examples/er-rest-example/resources/res-mirror.c
rename to examples/ipv6/er-rest-example/resources/res-mirror.c
diff --git a/examples/er-rest-example/resources/res-plugtest-create1.c b/examples/ipv6/er-rest-example/resources/res-plugtest-create1.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-create1.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-create1.c
diff --git a/examples/er-rest-example/resources/res-plugtest-create2.c b/examples/ipv6/er-rest-example/resources/res-plugtest-create2.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-create2.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-create2.c
diff --git a/examples/er-rest-example/resources/res-plugtest-create3.c b/examples/ipv6/er-rest-example/resources/res-plugtest-create3.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-create3.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-create3.c
diff --git a/examples/er-rest-example/resources/res-plugtest-large-create.c b/examples/ipv6/er-rest-example/resources/res-plugtest-large-create.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-large-create.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-large-create.c
diff --git a/examples/er-rest-example/resources/res-plugtest-large-update.c b/examples/ipv6/er-rest-example/resources/res-plugtest-large-update.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-large-update.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-large-update.c
diff --git a/examples/er-rest-example/resources/res-plugtest-large.c b/examples/ipv6/er-rest-example/resources/res-plugtest-large.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-large.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-large.c
diff --git a/examples/er-rest-example/resources/res-plugtest-links.c b/examples/ipv6/er-rest-example/resources/res-plugtest-links.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-links.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-links.c
diff --git a/examples/er-rest-example/resources/res-plugtest-locquery.c b/examples/ipv6/er-rest-example/resources/res-plugtest-locquery.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-locquery.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-locquery.c
diff --git a/examples/er-rest-example/resources/res-plugtest-longpath.c b/examples/ipv6/er-rest-example/resources/res-plugtest-longpath.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-longpath.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-longpath.c
diff --git a/examples/er-rest-example/resources/res-plugtest-multi.c b/examples/ipv6/er-rest-example/resources/res-plugtest-multi.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-multi.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-multi.c
diff --git a/examples/er-rest-example/resources/res-plugtest-obs.c b/examples/ipv6/er-rest-example/resources/res-plugtest-obs.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-obs.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-obs.c
diff --git a/examples/er-rest-example/resources/res-plugtest-path.c b/examples/ipv6/er-rest-example/resources/res-plugtest-path.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-path.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-path.c
diff --git a/examples/er-rest-example/resources/res-plugtest-query.c b/examples/ipv6/er-rest-example/resources/res-plugtest-query.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-query.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-query.c
diff --git a/examples/er-rest-example/resources/res-plugtest-separate.c b/examples/ipv6/er-rest-example/resources/res-plugtest-separate.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-separate.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-separate.c
diff --git a/examples/er-rest-example/resources/res-plugtest-test.c b/examples/ipv6/er-rest-example/resources/res-plugtest-test.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-test.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-test.c
diff --git a/examples/er-rest-example/resources/res-plugtest-validate.c b/examples/ipv6/er-rest-example/resources/res-plugtest-validate.c
similarity index 100%
rename from examples/er-rest-example/resources/res-plugtest-validate.c
rename to examples/ipv6/er-rest-example/resources/res-plugtest-validate.c
diff --git a/examples/er-rest-example/resources/res-push.c b/examples/ipv6/er-rest-example/resources/res-push.c
similarity index 100%
rename from examples/er-rest-example/resources/res-push.c
rename to examples/ipv6/er-rest-example/resources/res-push.c
diff --git a/examples/er-rest-example/resources/res-radio.c b/examples/ipv6/er-rest-example/resources/res-radio.c
similarity index 100%
rename from examples/er-rest-example/resources/res-radio.c
rename to examples/ipv6/er-rest-example/resources/res-radio.c
diff --git a/examples/er-rest-example/resources/res-separate.c b/examples/ipv6/er-rest-example/resources/res-separate.c
similarity index 100%
rename from examples/er-rest-example/resources/res-separate.c
rename to examples/ipv6/er-rest-example/resources/res-separate.c
diff --git a/examples/er-rest-example/resources/res-sht11.c b/examples/ipv6/er-rest-example/resources/res-sht11.c
similarity index 100%
rename from examples/er-rest-example/resources/res-sht11.c
rename to examples/ipv6/er-rest-example/resources/res-sht11.c
diff --git a/examples/er-rest-example/resources/res-sub.c b/examples/ipv6/er-rest-example/resources/res-sub.c
similarity index 100%
rename from examples/er-rest-example/resources/res-sub.c
rename to examples/ipv6/er-rest-example/resources/res-sub.c
diff --git a/examples/er-rest-example/resources/res-temperature.c b/examples/ipv6/er-rest-example/resources/res-temperature.c
similarity index 100%
rename from examples/er-rest-example/resources/res-temperature.c
rename to examples/ipv6/er-rest-example/resources/res-temperature.c
diff --git a/examples/er-rest-example/resources/res-toggle.c b/examples/ipv6/er-rest-example/resources/res-toggle.c
similarity index 100%
rename from examples/er-rest-example/resources/res-toggle.c
rename to examples/ipv6/er-rest-example/resources/res-toggle.c
diff --git a/examples/er-rest-example/server-client-native.csc b/examples/ipv6/er-rest-example/server-client-native.csc
similarity index 95%
rename from examples/er-rest-example/server-client-native.csc
rename to examples/ipv6/er-rest-example/server-client-native.csc
index 12162c6896b37ab078068f9723ddb42d245b25c0..500332c8fd05fe27ed80b0618450fa8df408c45d 100644
--- a/examples/er-rest-example/server-client-native.csc
+++ b/examples/ipv6/er-rest-example/server-client-native.csc
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+examples/ipv6/er-rest-example<?xml version="1.0" encoding="UTF-8"?>
 <simconf>
   <project EXPORT="discard">[APPS_DIR]/mrm</project>
   <project EXPORT="discard">[APPS_DIR]/mspsim</project>
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
       <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.c</source>
       <commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/er-rest-example/server-client-observe.csc b/examples/ipv6/er-rest-example/server-client-observe.csc
similarity index 95%
rename from examples/er-rest-example/server-client-observe.csc
rename to examples/ipv6/er-rest-example/server-client-observe.csc
index 5d006056a52c791776f70a2dcc4d50e62a4c0a42..bf03a4ad6c9d8b8ccdb882dd18133ea7035816fc 100644
--- a/examples/er-rest-example/server-client-observe.csc
+++ b/examples/ipv6/er-rest-example/server-client-observe.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
       <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-observe-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-observe-client.c</source>
       <commands EXPORT="discard">make er-example-observe-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-observe-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-observe-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/er-rest-example/server-client.csc b/examples/ipv6/er-rest-example/server-client.csc
similarity index 95%
rename from examples/er-rest-example/server-client.csc
rename to examples/ipv6/er-rest-example/server-client.csc
index adc621a39e59906c6c7fe12938d7ee15ceffb22e..1b13e2d0593c43a575ecef5665eac773f5345f5e 100644
--- a/examples/er-rest-example/server-client.csc
+++ b/examples/ipv6/er-rest-example/server-client.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
       <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.c</source>
       <commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/er-rest-example/server-only.csc b/examples/ipv6/er-rest-example/server-only.csc
similarity index 97%
rename from examples/er-rest-example/server-only.csc
rename to examples/ipv6/er-rest-example/server-only.csc
index 9bbea40bdc1ae857dcb91d696a24aebd05a4c307..de0ce129d63ba4d6000145d9087a39008c84746d 100644
--- a/examples/er-rest-example/server-only.csc
+++ b/examples/ipv6/er-rest-example/server-only.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
       <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/er-rest-example/er-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/udp-ipv6/Makefile b/examples/ipv6/udp-ipv6/Makefile
similarity index 86%
rename from examples/udp-ipv6/Makefile
rename to examples/ipv6/udp-ipv6/Makefile
index 15230c4f018c5ab3a7ab4d3feb27f0a585ef9002..d840a760390cb03f75e89403692defd9891e02c6 100644
--- a/examples/udp-ipv6/Makefile
+++ b/examples/ipv6/udp-ipv6/Makefile
@@ -1,6 +1,6 @@
 all: udp-server udp-client
 
-CONTIKI = ../..
+CONTIKI = ../../..
 CONTIKI_WITH_IPV6 = 1
 CFLAGS += -DUIP_CONF_ND6_SEND_NS=1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/udp-ipv6/Makefile.target b/examples/ipv6/udp-ipv6/Makefile.target
similarity index 100%
rename from examples/udp-ipv6/Makefile.target
rename to examples/ipv6/udp-ipv6/Makefile.target
diff --git a/examples/udp-ipv6/udp-client.c b/examples/ipv6/udp-ipv6/udp-client.c
similarity index 100%
rename from examples/udp-ipv6/udp-client.c
rename to examples/ipv6/udp-ipv6/udp-client.c
diff --git a/examples/udp-ipv6/udp-server.c b/examples/ipv6/udp-ipv6/udp-server.c
similarity index 100%
rename from examples/udp-ipv6/udp-server.c
rename to examples/ipv6/udp-ipv6/udp-server.c
diff --git a/examples/cc2538-common/Makefile b/examples/platform-specific/cc2538-common/Makefile
similarity index 88%
rename from examples/cc2538-common/Makefile
rename to examples/platform-specific/cc2538-common/Makefile
index 5fb51aeeab099dd56fc21633bdcf2a23649bb7cd..9758c3051c18313e92acb71c8d1f58bc3a8e53f6 100644
--- a/examples/cc2538-common/Makefile
+++ b/examples/platform-specific/cc2538-common/Makefile
@@ -3,5 +3,5 @@ CONTIKI_PROJECT = test-pwm timer-test test-uart
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538-common/Makefile.target b/examples/platform-specific/cc2538-common/Makefile.target
similarity index 100%
rename from examples/cc2538-common/Makefile.target
rename to examples/platform-specific/cc2538-common/Makefile.target
diff --git a/examples/cc2538-common/README.md b/examples/platform-specific/cc2538-common/README.md
similarity index 100%
rename from examples/cc2538-common/README.md
rename to examples/platform-specific/cc2538-common/README.md
diff --git a/examples/cc2538-common/crypto/Makefile b/examples/platform-specific/cc2538-common/crypto/Makefile
similarity index 88%
rename from examples/cc2538-common/crypto/Makefile
rename to examples/platform-specific/cc2538-common/crypto/Makefile
index 968347fae9fb4e5b5ca82bd684542ffebce2ca8b..b621dac955e7b9f0ae746d79191740cc827c7dae 100644
--- a/examples/cc2538-common/crypto/Makefile
+++ b/examples/platform-specific/cc2538-common/crypto/Makefile
@@ -3,5 +3,5 @@ CONTIKI_PROJECT += sha256-test
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538-common/crypto/Makefile.target b/examples/platform-specific/cc2538-common/crypto/Makefile.target
similarity index 100%
rename from examples/cc2538-common/crypto/Makefile.target
rename to examples/platform-specific/cc2538-common/crypto/Makefile.target
diff --git a/examples/cc2538-common/crypto/cbc-mac-test.c b/examples/platform-specific/cc2538-common/crypto/cbc-mac-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/cbc-mac-test.c
rename to examples/platform-specific/cc2538-common/crypto/cbc-mac-test.c
diff --git a/examples/cc2538-common/crypto/cbc-test.c b/examples/platform-specific/cc2538-common/crypto/cbc-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/cbc-test.c
rename to examples/platform-specific/cc2538-common/crypto/cbc-test.c
diff --git a/examples/cc2538-common/crypto/ccm-test.c b/examples/platform-specific/cc2538-common/crypto/ccm-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/ccm-test.c
rename to examples/platform-specific/cc2538-common/crypto/ccm-test.c
diff --git a/examples/cc2538-common/crypto/ctr-test.c b/examples/platform-specific/cc2538-common/crypto/ctr-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/ctr-test.c
rename to examples/platform-specific/cc2538-common/crypto/ctr-test.c
diff --git a/examples/cc2538-common/crypto/ecb-test.c b/examples/platform-specific/cc2538-common/crypto/ecb-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/ecb-test.c
rename to examples/platform-specific/cc2538-common/crypto/ecb-test.c
diff --git a/examples/cc2538-common/crypto/gcm-test.c b/examples/platform-specific/cc2538-common/crypto/gcm-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/gcm-test.c
rename to examples/platform-specific/cc2538-common/crypto/gcm-test.c
diff --git a/examples/cc2538-common/crypto/sha256-test.c b/examples/platform-specific/cc2538-common/crypto/sha256-test.c
similarity index 100%
rename from examples/cc2538-common/crypto/sha256-test.c
rename to examples/platform-specific/cc2538-common/crypto/sha256-test.c
diff --git a/examples/cc2538-common/mqtt-demo/Makefile b/examples/platform-specific/cc2538-common/mqtt-demo/Makefile
similarity index 85%
rename from examples/cc2538-common/mqtt-demo/Makefile
rename to examples/platform-specific/cc2538-common/mqtt-demo/Makefile
index 7db9716a665e7190d77a92100d8046a5c491368d..6a3af00063bdf7a099aff9598386eedc66c31112 100644
--- a/examples/cc2538-common/mqtt-demo/Makefile
+++ b/examples/platform-specific/cc2538-common/mqtt-demo/Makefile
@@ -6,5 +6,5 @@ CONTIKI_WITH_IPV6 = 1
 
 APPS += mqtt
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538-common/mqtt-demo/Makefile.target b/examples/platform-specific/cc2538-common/mqtt-demo/Makefile.target
similarity index 100%
rename from examples/cc2538-common/mqtt-demo/Makefile.target
rename to examples/platform-specific/cc2538-common/mqtt-demo/Makefile.target
diff --git a/examples/cc2538-common/mqtt-demo/README.md b/examples/platform-specific/cc2538-common/mqtt-demo/README.md
similarity index 100%
rename from examples/cc2538-common/mqtt-demo/README.md
rename to examples/platform-specific/cc2538-common/mqtt-demo/README.md
diff --git a/examples/cc2538-common/mqtt-demo/mqtt-demo.c b/examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
similarity index 100%
rename from examples/cc2538-common/mqtt-demo/mqtt-demo.c
rename to examples/platform-specific/cc2538-common/mqtt-demo/mqtt-demo.c
diff --git a/examples/cc2538-common/mqtt-demo/project-conf.h b/examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h
similarity index 100%
rename from examples/cc2538-common/mqtt-demo/project-conf.h
rename to examples/platform-specific/cc2538-common/mqtt-demo/project-conf.h
diff --git a/examples/cc2538-common/pka/Makefile b/examples/platform-specific/cc2538-common/pka/Makefile
similarity index 83%
rename from examples/cc2538-common/pka/Makefile
rename to examples/platform-specific/cc2538-common/pka/Makefile
index 5d1279f4c458ab11662750462536a8f1d3515be7..488e27db999ebcb245489538b09d19def7285409 100644
--- a/examples/cc2538-common/pka/Makefile
+++ b/examples/platform-specific/cc2538-common/pka/Makefile
@@ -2,5 +2,5 @@ CONTIKI_PROJECT = ecc-ecdh ecc-sign ecc-verify
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538-common/pka/Makefile.target b/examples/platform-specific/cc2538-common/pka/Makefile.target
similarity index 100%
rename from examples/cc2538-common/pka/Makefile.target
rename to examples/platform-specific/cc2538-common/pka/Makefile.target
diff --git a/examples/cc2538-common/pka/ecc-ecdh.c b/examples/platform-specific/cc2538-common/pka/ecc-ecdh.c
similarity index 100%
rename from examples/cc2538-common/pka/ecc-ecdh.c
rename to examples/platform-specific/cc2538-common/pka/ecc-ecdh.c
diff --git a/examples/cc2538-common/pka/ecc-sign.c b/examples/platform-specific/cc2538-common/pka/ecc-sign.c
similarity index 100%
rename from examples/cc2538-common/pka/ecc-sign.c
rename to examples/platform-specific/cc2538-common/pka/ecc-sign.c
diff --git a/examples/cc2538-common/pka/ecc-verify.c b/examples/platform-specific/cc2538-common/pka/ecc-verify.c
similarity index 100%
rename from examples/cc2538-common/pka/ecc-verify.c
rename to examples/platform-specific/cc2538-common/pka/ecc-verify.c
diff --git a/examples/cc2538-common/project-conf.h b/examples/platform-specific/cc2538-common/project-conf.h
similarity index 100%
rename from examples/cc2538-common/project-conf.h
rename to examples/platform-specific/cc2538-common/project-conf.h
diff --git a/examples/cc2538-common/test-pwm.c b/examples/platform-specific/cc2538-common/test-pwm.c
similarity index 100%
rename from examples/cc2538-common/test-pwm.c
rename to examples/platform-specific/cc2538-common/test-pwm.c
diff --git a/examples/cc2538-common/test-uart.c b/examples/platform-specific/cc2538-common/test-uart.c
similarity index 100%
rename from examples/cc2538-common/test-uart.c
rename to examples/platform-specific/cc2538-common/test-uart.c
diff --git a/examples/cc2538-common/timer-test.c b/examples/platform-specific/cc2538-common/timer-test.c
similarity index 100%
rename from examples/cc2538-common/timer-test.c
rename to examples/platform-specific/cc2538-common/timer-test.c
diff --git a/examples/cc2538dk/Makefile b/examples/platform-specific/cc2538dk/Makefile
similarity index 89%
rename from examples/cc2538dk/Makefile
rename to examples/platform-specific/cc2538dk/Makefile
index 4cb4d4979c2ec8e1483a8048927429025326556b..1e19153dc52705051cf290513f8a17765991a716 100644
--- a/examples/cc2538dk/Makefile
+++ b/examples/platform-specific/cc2538dk/Makefile
@@ -3,6 +3,6 @@ CONTIKI_PROJECT = cc2538-demo
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538dk/Makefile.target b/examples/platform-specific/cc2538dk/Makefile.target
similarity index 100%
rename from examples/cc2538dk/Makefile.target
rename to examples/platform-specific/cc2538dk/Makefile.target
diff --git a/examples/cc2538dk/cc2538-demo.c b/examples/platform-specific/cc2538dk/cc2538-demo.c
similarity index 100%
rename from examples/cc2538dk/cc2538-demo.c
rename to examples/platform-specific/cc2538dk/cc2538-demo.c
diff --git a/examples/cc2538dk/project-conf.h b/examples/platform-specific/cc2538dk/project-conf.h
similarity index 100%
rename from examples/cc2538dk/project-conf.h
rename to examples/platform-specific/cc2538dk/project-conf.h
diff --git a/examples/cc2538dk/udp-ipv6-echo-server/Makefile b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/Makefile
similarity index 87%
rename from examples/cc2538dk/udp-ipv6-echo-server/Makefile
rename to examples/platform-specific/cc2538dk/udp-ipv6-echo-server/Makefile
index 5bbbdd676d5e13ab5335034c909b6a5a488c7534..6f632161d73dfdf6ab70093f33e9d29926e67e6c 100644
--- a/examples/cc2538dk/udp-ipv6-echo-server/Makefile
+++ b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/Makefile
@@ -2,7 +2,7 @@ CONTIKI_PROJECT = udp-echo-server
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 CONTIKI_WITH_IPV6 = 1
 CFLAGS += -DUIP_CONF_ND6_SEND_NS=1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc2538dk/udp-ipv6-echo-server/Makefile.target b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/Makefile.target
similarity index 100%
rename from examples/cc2538dk/udp-ipv6-echo-server/Makefile.target
rename to examples/platform-specific/cc2538dk/udp-ipv6-echo-server/Makefile.target
diff --git a/examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c b/examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c
similarity index 100%
rename from examples/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c
rename to examples/platform-specific/cc2538dk/udp-ipv6-echo-server/udp-echo-server.c
diff --git a/examples/cc26xx/Makefile b/examples/platform-specific/cc26xx/Makefile
similarity index 89%
rename from examples/cc26xx/Makefile
rename to examples/platform-specific/cc26xx/Makefile
index f23d49fe351615ef1a62730fcce332096ea51b2c..cdae0b8f4e08970cbead71011155cb8f34617d3f 100644
--- a/examples/cc26xx/Makefile
+++ b/examples/platform-specific/cc26xx/Makefile
@@ -5,5 +5,5 @@ all: $(CONTIKI_PROJECT)
 
 CONTIKI_WITH_IPV6 = 1
 
-CONTIKI = ../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc26xx/Makefile.target b/examples/platform-specific/cc26xx/Makefile.target
similarity index 100%
rename from examples/cc26xx/Makefile.target
rename to examples/platform-specific/cc26xx/Makefile.target
diff --git a/examples/cc26xx/README.md b/examples/platform-specific/cc26xx/README.md
similarity index 100%
rename from examples/cc26xx/README.md
rename to examples/platform-specific/cc26xx/README.md
diff --git a/examples/cc26xx/cc26xx-demo.c b/examples/platform-specific/cc26xx/cc26xx-demo.c
similarity index 100%
rename from examples/cc26xx/cc26xx-demo.c
rename to examples/platform-specific/cc26xx/cc26xx-demo.c
diff --git a/examples/cc26xx/cc26xx-web-demo/Makefile b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
similarity index 96%
rename from examples/cc26xx/cc26xx-web-demo/Makefile
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
index 1da0a77473296796a8910a3d9083c597254fe1ce..5050c300e0bfa0e458cc8b90532ee316e7c42e99 100644
--- a/examples/cc26xx/cc26xx-web-demo/Makefile
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
@@ -20,5 +20,5 @@ APPS += er-coap
 APPS += rest-engine
 APPS += mqtt
 
-CONTIKI=../../..
+CONTIKI=../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc26xx/cc26xx-web-demo/Makefile.target b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile.target
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/Makefile.target
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile.target
diff --git a/examples/cc26xx/cc26xx-web-demo/README.md b/examples/platform-specific/cc26xx/cc26xx-web-demo/README.md
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/README.md
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/README.md
diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
diff --git a/examples/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
diff --git a/examples/cc26xx/cc26xx-web-demo/coap-server.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/coap-server.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.c
diff --git a/examples/cc26xx/cc26xx-web-demo/coap-server.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/coap-server.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.h
diff --git a/examples/cc26xx/cc26xx-web-demo/httpd-simple.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/httpd-simple.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.c
diff --git a/examples/cc26xx/cc26xx-web-demo/httpd-simple.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/httpd-simple.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.h
diff --git a/examples/cc26xx/cc26xx-web-demo/img/6lbr-web.png b/examples/platform-specific/cc26xx/cc26xx-web-demo/img/6lbr-web.png
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/img/6lbr-web.png
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/img/6lbr-web.png
diff --git a/examples/cc26xx/cc26xx-web-demo/img/coap-resources.png b/examples/platform-specific/cc26xx/cc26xx-web-demo/img/coap-resources.png
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/img/coap-resources.png
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/img/coap-resources.png
diff --git a/examples/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png b/examples/platform-specific/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png
diff --git a/examples/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png b/examples/platform-specific/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png
diff --git a/examples/cc26xx/cc26xx-web-demo/img/well-known-core.png b/examples/platform-specific/cc26xx/cc26xx-web-demo/img/well-known-core.png
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/img/well-known-core.png
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/img/well-known-core.png
diff --git a/examples/cc26xx/cc26xx-web-demo/mqtt-client.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/mqtt-client.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
diff --git a/examples/cc26xx/cc26xx-web-demo/mqtt-client.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/mqtt-client.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.h
diff --git a/examples/cc26xx/cc26xx-web-demo/net-uart.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/net-uart.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
diff --git a/examples/cc26xx/cc26xx-web-demo/net-uart.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/net-uart.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h
diff --git a/examples/cc26xx/cc26xx-web-demo/project-conf.h b/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/project-conf.h
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-device.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-device.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-leds.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-leds.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-leds.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-leds.c
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-net.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-net.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-sensors.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-sensors.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
diff --git a/examples/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c
similarity index 100%
rename from examples/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c
rename to examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c
diff --git a/examples/cc26xx/project-conf.h b/examples/platform-specific/cc26xx/project-conf.h
similarity index 100%
rename from examples/cc26xx/project-conf.h
rename to examples/platform-specific/cc26xx/project-conf.h
diff --git a/examples/cc26xx/very-sleepy-demo/Makefile b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
similarity index 90%
rename from examples/cc26xx/very-sleepy-demo/Makefile
rename to examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
index a1e7949571be608308d846489b0989a287222244..205f52eeb9795677be94d0287b98c6609c51b6ed 100644
--- a/examples/cc26xx/very-sleepy-demo/Makefile
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
@@ -8,5 +8,5 @@ CONTIKI_WITH_IPV6 = 1
 APPS += er-coap
 APPS += rest-engine
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/cc26xx/very-sleepy-demo/Makefile.target b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile.target
similarity index 100%
rename from examples/cc26xx/very-sleepy-demo/Makefile.target
rename to examples/platform-specific/cc26xx/very-sleepy-demo/Makefile.target
diff --git a/examples/cc26xx/very-sleepy-demo/README.md b/examples/platform-specific/cc26xx/very-sleepy-demo/README.md
similarity index 100%
rename from examples/cc26xx/very-sleepy-demo/README.md
rename to examples/platform-specific/cc26xx/very-sleepy-demo/README.md
diff --git a/examples/cc26xx/very-sleepy-demo/project-conf.h b/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h
similarity index 100%
rename from examples/cc26xx/very-sleepy-demo/project-conf.h
rename to examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h
diff --git a/examples/cc26xx/very-sleepy-demo/very-sleepy-demo.c b/examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
similarity index 100%
rename from examples/cc26xx/very-sleepy-demo/very-sleepy-demo.c
rename to examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
diff --git a/examples/galileo/Makefile b/examples/platform-specific/galileo/Makefile
similarity index 97%
rename from examples/galileo/Makefile
rename to examples/platform-specific/galileo/Makefile
index 0852fe0856610b7dc5b52bec0aab5caf456ab19b..7dbf9b4365d6f5cb8af0c59d89edcd110b0acb83 100644
--- a/examples/galileo/Makefile
+++ b/examples/platform-specific/galileo/Makefile
@@ -22,5 +22,5 @@ CONTIKI_PROJECT = $(EXAMPLE)
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/galileo/README.md b/examples/platform-specific/galileo/README.md
similarity index 100%
rename from examples/galileo/README.md
rename to examples/platform-specific/galileo/README.md
diff --git a/examples/galileo/gpio-input.c b/examples/platform-specific/galileo/gpio-input.c
similarity index 100%
rename from examples/galileo/gpio-input.c
rename to examples/platform-specific/galileo/gpio-input.c
diff --git a/examples/galileo/gpio-interrupt.c b/examples/platform-specific/galileo/gpio-interrupt.c
similarity index 100%
rename from examples/galileo/gpio-interrupt.c
rename to examples/platform-specific/galileo/gpio-interrupt.c
diff --git a/examples/galileo/gpio-output.c b/examples/platform-specific/galileo/gpio-output.c
similarity index 100%
rename from examples/galileo/gpio-output.c
rename to examples/platform-specific/galileo/gpio-output.c
diff --git a/examples/galileo/i2c-LSM9DS0.c b/examples/platform-specific/galileo/i2c-LSM9DS0.c
similarity index 100%
rename from examples/galileo/i2c-LSM9DS0.c
rename to examples/platform-specific/galileo/i2c-LSM9DS0.c
diff --git a/examples/galileo/i2c-callbacks.c b/examples/platform-specific/galileo/i2c-callbacks.c
similarity index 100%
rename from examples/galileo/i2c-callbacks.c
rename to examples/platform-specific/galileo/i2c-callbacks.c
diff --git a/examples/galileo/print-imr.c b/examples/platform-specific/galileo/print-imr.c
similarity index 100%
rename from examples/galileo/print-imr.c
rename to examples/platform-specific/galileo/print-imr.c
diff --git a/examples/galileo/prot-domain-switch-latency.c b/examples/platform-specific/galileo/prot-domain-switch-latency.c
similarity index 100%
rename from examples/galileo/prot-domain-switch-latency.c
rename to examples/platform-specific/galileo/prot-domain-switch-latency.c
diff --git a/examples/jn516x/README.md b/examples/platform-specific/jn516x/README.md
similarity index 100%
rename from examples/jn516x/README.md
rename to examples/platform-specific/jn516x/README.md
diff --git a/examples/jn516x/dr1175-sensors/Makefile b/examples/platform-specific/jn516x/dr1175-sensors/Makefile
similarity index 89%
rename from examples/jn516x/dr1175-sensors/Makefile
rename to examples/platform-specific/jn516x/dr1175-sensors/Makefile
index ec1a00c1e8406f4bc56a06eb4c0509940458e857..96f0a4f6c00da841faa50a071340184954114927 100644
--- a/examples/jn516x/dr1175-sensors/Makefile
+++ b/examples/platform-specific/jn516x/dr1175-sensors/Makefile
@@ -1,4 +1,4 @@
-CONTIKI=../../..
+CONTIKI=../../../..
 CONTIKI_PROJECT = node
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
diff --git a/examples/jn516x/dr1175-sensors/README.md b/examples/platform-specific/jn516x/dr1175-sensors/README.md
similarity index 100%
rename from examples/jn516x/dr1175-sensors/README.md
rename to examples/platform-specific/jn516x/dr1175-sensors/README.md
diff --git a/examples/jn516x/dr1175-sensors/node.c b/examples/platform-specific/jn516x/dr1175-sensors/node.c
similarity index 100%
rename from examples/jn516x/dr1175-sensors/node.c
rename to examples/platform-specific/jn516x/dr1175-sensors/node.c
diff --git a/examples/jn516x/dr1175-sensors/project-conf.h b/examples/platform-specific/jn516x/dr1175-sensors/project-conf.h
similarity index 100%
rename from examples/jn516x/dr1175-sensors/project-conf.h
rename to examples/platform-specific/jn516x/dr1175-sensors/project-conf.h
diff --git a/examples/jn516x/rpl/README.md b/examples/platform-specific/jn516x/rpl/README.md
similarity index 100%
rename from examples/jn516x/rpl/README.md
rename to examples/platform-specific/jn516x/rpl/README.md
diff --git a/examples/jn516x/rpl/border-router/Makefile b/examples/platform-specific/jn516x/rpl/border-router/Makefile
similarity index 97%
rename from examples/jn516x/rpl/border-router/Makefile
rename to examples/platform-specific/jn516x/rpl/border-router/Makefile
index 1904e5ce827636a83ceaf73d70b92d33b698aefb..edd5b1c65eb80e49dc9dae53fcaa5908e89159c2 100644
--- a/examples/jn516x/rpl/border-router/Makefile
+++ b/examples/platform-specific/jn516x/rpl/border-router/Makefile
@@ -3,7 +3,7 @@ all: $(CONTIKI_PROJECT)
 
 TARGET ?= jn516x
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/rpl/border-router/README.md b/examples/platform-specific/jn516x/rpl/border-router/README.md
similarity index 100%
rename from examples/jn516x/rpl/border-router/README.md
rename to examples/platform-specific/jn516x/rpl/border-router/README.md
diff --git a/examples/jn516x/rpl/border-router/border-router.c b/examples/platform-specific/jn516x/rpl/border-router/border-router.c
similarity index 100%
rename from examples/jn516x/rpl/border-router/border-router.c
rename to examples/platform-specific/jn516x/rpl/border-router/border-router.c
diff --git a/examples/jn516x/rpl/border-router/project-conf.h b/examples/platform-specific/jn516x/rpl/border-router/project-conf.h
similarity index 100%
rename from examples/jn516x/rpl/border-router/project-conf.h
rename to examples/platform-specific/jn516x/rpl/border-router/project-conf.h
diff --git a/examples/jn516x/rpl/border-router/slip-bridge.c b/examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c
similarity index 100%
rename from examples/jn516x/rpl/border-router/slip-bridge.c
rename to examples/platform-specific/jn516x/rpl/border-router/slip-bridge.c
diff --git a/examples/jn516x/rpl/coap-dongle-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
similarity index 94%
rename from examples/jn516x/rpl/coap-dongle-node/Makefile
rename to examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
index 7473318458287e05823cd5183cfcfb059a0dcacb..b2eb9b0dd6c7f06964b97e386a49db818bb32c03 100644
--- a/examples/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/rpl/coap-dongle-node/README.md b/examples/platform-specific/jn516x/rpl/coap-dongle-node/README.md
similarity index 100%
rename from examples/jn516x/rpl/coap-dongle-node/README.md
rename to examples/platform-specific/jn516x/rpl/coap-dongle-node/README.md
diff --git a/examples/jn516x/rpl/coap-dongle-node/dongle-node.c b/examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c
similarity index 100%
rename from examples/jn516x/rpl/coap-dongle-node/dongle-node.c
rename to examples/platform-specific/jn516x/rpl/coap-dongle-node/dongle-node.c
diff --git a/examples/jn516x/rpl/coap-dongle-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h
similarity index 100%
rename from examples/jn516x/rpl/coap-dongle-node/project-conf.h
rename to examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h
diff --git a/examples/jn516x/rpl/coap-dr1175-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
similarity index 94%
rename from examples/jn516x/rpl/coap-dr1175-node/Makefile
rename to examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
index d00fc9b9cbd0b976f90388eaf23ed089cd7d4124..f634f9747a22d7e3ff1f916f400120b6133d2bfc 100644
--- a/examples/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)
 TARGET ?= jn516x
 JN516x_WITH_DR1175 = 1
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/rpl/coap-dr1175-node/README.md b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/README.md
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1175-node/README.md
rename to examples/platform-specific/jn516x/rpl/coap-dr1175-node/README.md
diff --git a/examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1175-node/dr1175-node.c
rename to examples/platform-specific/jn516x/rpl/coap-dr1175-node/dr1175-node.c
diff --git a/examples/jn516x/rpl/coap-dr1175-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1175-node/project-conf.h
rename to examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h
diff --git a/examples/jn516x/rpl/coap-dr1199-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
similarity index 94%
rename from examples/jn516x/rpl/coap-dr1199-node/Makefile
rename to examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
index 9dc391e520c7e4edc47eeb2f689f2eae487f72e9..c1712e40a469a334e243fb8d40752a006d58540f 100644
--- a/examples/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)
 TARGET ?= jn516x
 JN516x_WITH_DR1199 = 1
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/rpl/coap-dr1199-node/README.md b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/README.md
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1199-node/README.md
rename to examples/platform-specific/jn516x/rpl/coap-dr1199-node/README.md
diff --git a/examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1199-node/dr1199-node.c
rename to examples/platform-specific/jn516x/rpl/coap-dr1199-node/dr1199-node.c
diff --git a/examples/jn516x/rpl/coap-dr1199-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h
similarity index 100%
rename from examples/jn516x/rpl/coap-dr1199-node/project-conf.h
rename to examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h
diff --git a/examples/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h
similarity index 100%
rename from examples/jn516x/rpl/common-conf.h
rename to examples/platform-specific/jn516x/rpl/common-conf.h
diff --git a/examples/jn516x/rpl/node/Makefile b/examples/platform-specific/jn516x/rpl/node/Makefile
similarity index 91%
rename from examples/jn516x/rpl/node/Makefile
rename to examples/platform-specific/jn516x/rpl/node/Makefile
index 44cd68d8de7f57a8944271114465c40f313c72c8..3389d64fe13d9681eea9b2f3fcac5a099fac0233 100644
--- a/examples/jn516x/rpl/node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/node/Makefile
@@ -3,7 +3,7 @@ all: $(CONTIKI_PROJECT)
 
 TARGET ?= jn516x
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/rpl/node/README.md b/examples/platform-specific/jn516x/rpl/node/README.md
similarity index 100%
rename from examples/jn516x/rpl/node/README.md
rename to examples/platform-specific/jn516x/rpl/node/README.md
diff --git a/examples/jn516x/rpl/node/node.c b/examples/platform-specific/jn516x/rpl/node/node.c
similarity index 100%
rename from examples/jn516x/rpl/node/node.c
rename to examples/platform-specific/jn516x/rpl/node/node.c
diff --git a/examples/jn516x/rpl/node/project-conf.h b/examples/platform-specific/jn516x/rpl/node/project-conf.h
similarity index 100%
rename from examples/jn516x/rpl/node/project-conf.h
rename to examples/platform-specific/jn516x/rpl/node/project-conf.h
diff --git a/examples/jn516x/rpl/tools/rpl-tools.c b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
similarity index 100%
rename from examples/jn516x/rpl/tools/rpl-tools.c
rename to examples/platform-specific/jn516x/rpl/tools/rpl-tools.c
diff --git a/examples/jn516x/rpl/tools/rpl-tools.h b/examples/platform-specific/jn516x/rpl/tools/rpl-tools.h
similarity index 100%
rename from examples/jn516x/rpl/tools/rpl-tools.h
rename to examples/platform-specific/jn516x/rpl/tools/rpl-tools.h
diff --git a/examples/jn516x/tsch/README.md b/examples/platform-specific/jn516x/tsch/README.md
similarity index 100%
rename from examples/jn516x/tsch/README.md
rename to examples/platform-specific/jn516x/tsch/README.md
diff --git a/examples/jn516x/tsch/common-conf-jn516x.h b/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h
similarity index 100%
rename from examples/jn516x/tsch/common-conf-jn516x.h
rename to examples/platform-specific/jn516x/tsch/common-conf-jn516x.h
diff --git a/examples/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h
similarity index 100%
rename from examples/jn516x/tsch/common-conf.h
rename to examples/platform-specific/jn516x/tsch/common-conf.h
diff --git a/examples/jn516x/tsch/simple-sensor-network/README.md b/examples/platform-specific/jn516x/tsch/simple-sensor-network/README.md
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/README.md
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/README.md
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
similarity index 94%
rename from examples/jn516x/tsch/simple-sensor-network/node/Makefile
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
index 2df54d578a4a8bebc7d8b450ba1fb66eb8fd8cb4..b9b9bf43b8147f1aec301748828bd1d386f39bcc 100644
--- a/examples/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@@ -3,7 +3,7 @@ CONTIKI_PROJECT = node
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
 
-CONTIKI=../../../../..
+CONTIKI=../../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/README.md b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/README.md
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/node/README.md
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/node/README.md
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/node.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/node/node.c
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/node/node.c
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/project-conf.h b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/node/project-conf.h
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h
diff --git a/examples/jn516x/tsch/simple-sensor-network/node/waveform.h b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/waveform.h
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/node/waveform.h
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/node/waveform.h
diff --git a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
similarity index 97%
rename from examples/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
index 1598632efa12b23f89af0944adb762b185a3ee63..d3ddf29432a3742f0dbb29bf879700b3757408bd 100644
--- a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@@ -2,7 +2,7 @@ CONTIKI_PROJECT=border-router
 
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
-CONTIKI=../../../../..
+CONTIKI=../../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/README.md b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/README.md
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/rpl-border-router/README.md
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/README.md
diff --git a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/border-router.c
diff --git a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
diff --git a/examples/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/slip-bridge.c
diff --git a/examples/jn516x/tsch/simple-sensor-network/script/Output-Visualisation.py b/examples/platform-specific/jn516x/tsch/simple-sensor-network/script/Output-Visualisation.py
similarity index 100%
rename from examples/jn516x/tsch/simple-sensor-network/script/Output-Visualisation.py
rename to examples/platform-specific/jn516x/tsch/simple-sensor-network/script/Output-Visualisation.py
diff --git a/examples/jn516x/tsch/tools/rpl-tools.c b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
similarity index 100%
rename from examples/jn516x/tsch/tools/rpl-tools.c
rename to examples/platform-specific/jn516x/tsch/tools/rpl-tools.c
diff --git a/examples/jn516x/tsch/tools/rpl-tools.h b/examples/platform-specific/jn516x/tsch/tools/rpl-tools.h
similarity index 100%
rename from examples/jn516x/tsch/tools/rpl-tools.h
rename to examples/platform-specific/jn516x/tsch/tools/rpl-tools.h
diff --git a/examples/jn516x/tsch/tx-power-verification/README.md b/examples/platform-specific/jn516x/tsch/tx-power-verification/README.md
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/README.md
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/README.md
diff --git a/examples/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
similarity index 94%
rename from examples/jn516x/tsch/tx-power-verification/node/Makefile
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
index 0cb2d4bcb718abac74d4d9fb2cc2d6b6a233d77e..2b6b0cc5c18db6cf73b5dc499ce0faf488e1a6c5 100644
--- a/examples/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@@ -3,7 +3,7 @@ CONTIKI_PROJECT = node
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
 
-CONTIKI=../../../../..
+CONTIKI=../../../../../..
 CONTIKI_WITH_IPV6 = 1
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/tsch/tx-power-verification/node/node.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/node/node.c
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/node/node.c
diff --git a/examples/jn516x/tsch/tx-power-verification/node/project-conf.h b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/node/project-conf.h
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h
diff --git a/examples/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
similarity index 97%
rename from examples/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
index 15c5da2a2973eed47b85581b8af3f4b93419ac66..38b70a225d98e6c0d9a38c9b66635dca14b8641e 100644
--- a/examples/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
@@ -3,7 +3,7 @@ CONTIKI_PROJECT=rpl-border-router
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
 
-CONTIKI=../../../../..
+CONTIKI=../../../../../..
 
 CONTIKI_WITH_IPV6 = 1
 
diff --git a/examples/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
diff --git a/examples/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/rpl-border-router.c
diff --git a/examples/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c
similarity index 100%
rename from examples/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c
rename to examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/slip-bridge.c
diff --git a/examples/jn516x/tsch/uart1-test-node/Makefile b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
similarity index 95%
rename from examples/jn516x/tsch/uart1-test-node/Makefile
rename to examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
index 76a3d6252823bb226e9f83be26c155263b7fe415..124d7873a5b206acbdc19b1f71f4bc351b8fe5d5 100644
--- a/examples/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@@ -4,7 +4,7 @@ TARGET = jn516x
 JN516x_WITH_DR1174 = 1
 TARGET_WITH_UART1 = 1
 
-CONTIKI=../../../..
+CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
diff --git a/examples/jn516x/tsch/uart1-test-node/README.md b/examples/platform-specific/jn516x/tsch/uart1-test-node/README.md
similarity index 100%
rename from examples/jn516x/tsch/uart1-test-node/README.md
rename to examples/platform-specific/jn516x/tsch/uart1-test-node/README.md
diff --git a/examples/jn516x/tsch/uart1-test-node/project-conf.h b/examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h
similarity index 100%
rename from examples/jn516x/tsch/uart1-test-node/project-conf.h
rename to examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h
diff --git a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c
similarity index 100%
rename from examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
rename to examples/platform-specific/jn516x/tsch/uart1-test-node/uart1-test-node.c
diff --git a/examples/nrf52dk/blink-hello/Makefile b/examples/platform-specific/nrf52dk/blink-hello/Makefile
similarity index 86%
rename from examples/nrf52dk/blink-hello/Makefile
rename to examples/platform-specific/nrf52dk/blink-hello/Makefile
index 5b056a5187ed8bbe9bde39f1bcd244336a124ae9..390ef5cfeada3ed5f5047469bc1c8868431a0b80 100644
--- a/examples/nrf52dk/blink-hello/Makefile
+++ b/examples/platform-specific/nrf52dk/blink-hello/Makefile
@@ -5,5 +5,5 @@ NRF52_WITHOUT_SOFTDEVICE=1
 
 all: $(CONTIKI_PROJECT) 
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/blink-hello/README.md b/examples/platform-specific/nrf52dk/blink-hello/README.md
similarity index 100%
rename from examples/nrf52dk/blink-hello/README.md
rename to examples/platform-specific/nrf52dk/blink-hello/README.md
diff --git a/examples/nrf52dk/blink-hello/blink-hello.c b/examples/platform-specific/nrf52dk/blink-hello/blink-hello.c
similarity index 100%
rename from examples/nrf52dk/blink-hello/blink-hello.c
rename to examples/platform-specific/nrf52dk/blink-hello/blink-hello.c
diff --git a/examples/nrf52dk/coap-demo/Makefile b/examples/platform-specific/nrf52dk/coap-demo/Makefile
similarity index 97%
rename from examples/nrf52dk/coap-demo/Makefile
rename to examples/platform-specific/nrf52dk/coap-demo/Makefile
index 077e469bea2ecbe6ef9c131a3f7b9feedcde0b4a..033c2710424dd63b27be9f53ba72a765758e3080 100644
--- a/examples/nrf52dk/coap-demo/Makefile
+++ b/examples/platform-specific/nrf52dk/coap-demo/Makefile
@@ -1,4 +1,4 @@
-CONTIKI=../../..
+CONTIKI=../../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 ifeq ($(MAKECMDGOALS),)
diff --git a/examples/nrf52dk/coap-demo/README.md b/examples/platform-specific/nrf52dk/coap-demo/README.md
similarity index 100%
rename from examples/nrf52dk/coap-demo/README.md
rename to examples/platform-specific/nrf52dk/coap-demo/README.md
diff --git a/examples/nrf52dk/coap-demo/coap-client.c b/examples/platform-specific/nrf52dk/coap-demo/coap-client.c
similarity index 100%
rename from examples/nrf52dk/coap-demo/coap-client.c
rename to examples/platform-specific/nrf52dk/coap-demo/coap-client.c
diff --git a/examples/nrf52dk/coap-demo/coap-server.c b/examples/platform-specific/nrf52dk/coap-demo/coap-server.c
similarity index 100%
rename from examples/nrf52dk/coap-demo/coap-server.c
rename to examples/platform-specific/nrf52dk/coap-demo/coap-server.c
diff --git a/examples/nrf52dk/coap-demo/project-conf.h b/examples/platform-specific/nrf52dk/coap-demo/project-conf.h
similarity index 100%
rename from examples/nrf52dk/coap-demo/project-conf.h
rename to examples/platform-specific/nrf52dk/coap-demo/project-conf.h
diff --git a/examples/nrf52dk/coap-demo/resources/res-leds.c b/examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c
similarity index 100%
rename from examples/nrf52dk/coap-demo/resources/res-leds.c
rename to examples/platform-specific/nrf52dk/coap-demo/resources/res-leds.c
diff --git a/examples/nrf52dk/mqtt-demo/Makefile b/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
similarity index 88%
rename from examples/nrf52dk/mqtt-demo/Makefile
rename to examples/platform-specific/nrf52dk/mqtt-demo/Makefile
index bfdeccfb7cf1946442c3a01bcf7254eb71e933de..c1e8e8da577030b791baf52c17ef5edcb1e81052 100644
--- a/examples/nrf52dk/mqtt-demo/Makefile
+++ b/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
@@ -7,5 +7,5 @@ CONTIKI_WITH_RPL = 0
 
 APPS += mqtt
 
-CONTIKI=../../..
+CONTIKI=../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/mqtt-demo/README.md b/examples/platform-specific/nrf52dk/mqtt-demo/README.md
similarity index 100%
rename from examples/nrf52dk/mqtt-demo/README.md
rename to examples/platform-specific/nrf52dk/mqtt-demo/README.md
diff --git a/examples/nrf52dk/mqtt-demo/mqtt-demo.c b/examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
similarity index 100%
rename from examples/nrf52dk/mqtt-demo/mqtt-demo.c
rename to examples/platform-specific/nrf52dk/mqtt-demo/mqtt-demo.c
diff --git a/examples/nrf52dk/mqtt-demo/project-conf.h b/examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h
similarity index 100%
rename from examples/nrf52dk/mqtt-demo/project-conf.h
rename to examples/platform-specific/nrf52dk/mqtt-demo/project-conf.h
diff --git a/examples/nrf52dk/timer-test/Makefile b/examples/platform-specific/nrf52dk/timer-test/Makefile
similarity index 86%
rename from examples/nrf52dk/timer-test/Makefile
rename to examples/platform-specific/nrf52dk/timer-test/Makefile
index ac89a34a40509ca42ad28f71e6cd01ff4c24dcd6..7d25075583b404346d00af7f836b3c770649aa16 100644
--- a/examples/nrf52dk/timer-test/Makefile
+++ b/examples/platform-specific/nrf52dk/timer-test/Makefile
@@ -5,5 +5,5 @@ NRF52_WITHOUT_SOFTDEVICE=1
 
 all: $(CONTIKI_PROJECT) 
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/nrf52dk/timer-test/README.md b/examples/platform-specific/nrf52dk/timer-test/README.md
similarity index 100%
rename from examples/nrf52dk/timer-test/README.md
rename to examples/platform-specific/nrf52dk/timer-test/README.md
diff --git a/examples/nrf52dk/timer-test/timer-test.c b/examples/platform-specific/nrf52dk/timer-test/timer-test.c
similarity index 100%
rename from examples/nrf52dk/timer-test/timer-test.c
rename to examples/platform-specific/nrf52dk/timer-test/timer-test.c
diff --git a/examples/openmote-cc2538/Makefile b/examples/platform-specific/openmote-cc2538/Makefile
similarity index 89%
rename from examples/openmote-cc2538/Makefile
rename to examples/platform-specific/openmote-cc2538/Makefile
index e5e5eb4f34e16bdb6fd29749d2d1f0a940e5c224..b70be80c947111b31d7685247f180f79f8336bdd 100644
--- a/examples/openmote-cc2538/Makefile
+++ b/examples/platform-specific/openmote-cc2538/Makefile
@@ -4,6 +4,6 @@ CONTIKI_PROJECT = openmote-demo
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../..
+CONTIKI = ../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/openmote-cc2538/openmote-demo.c b/examples/platform-specific/openmote-cc2538/openmote-demo.c
similarity index 100%
rename from examples/openmote-cc2538/openmote-demo.c
rename to examples/platform-specific/openmote-cc2538/openmote-demo.c
diff --git a/examples/openmote-cc2538/openmote-demo.gdb b/examples/platform-specific/openmote-cc2538/openmote-demo.gdb
similarity index 100%
rename from examples/openmote-cc2538/openmote-demo.gdb
rename to examples/platform-specific/openmote-cc2538/openmote-demo.gdb
diff --git a/examples/openmote-cc2538/project-conf.h b/examples/platform-specific/openmote-cc2538/project-conf.h
similarity index 100%
rename from examples/openmote-cc2538/project-conf.h
rename to examples/platform-specific/openmote-cc2538/project-conf.h
diff --git a/examples/ipv6/sky-websense/Makefile b/examples/platform-specific/sky-websense/Makefile
similarity index 96%
rename from examples/ipv6/sky-websense/Makefile
rename to examples/platform-specific/sky-websense/Makefile
index 7096128a42629dcebbc0d9453156eb0007733243..726135a989dc7d73c2f65fe5b767ee589ae6041a 100644
--- a/examples/ipv6/sky-websense/Makefile
+++ b/examples/platform-specific/sky-websense/Makefile
@@ -1,6 +1,6 @@
 all: sky-websense
 
-CONTIKI=../../..
+CONTIKI=../../../..
 
 APPS += webbrowser
 
diff --git a/examples/ipv6/sky-websense/Makefile.target b/examples/platform-specific/sky-websense/Makefile.target
similarity index 100%
rename from examples/ipv6/sky-websense/Makefile.target
rename to examples/platform-specific/sky-websense/Makefile.target
diff --git a/examples/ipv6/sky-websense/README.md b/examples/platform-specific/sky-websense/README.md
similarity index 100%
rename from examples/ipv6/sky-websense/README.md
rename to examples/platform-specific/sky-websense/README.md
diff --git a/examples/ipv6/sky-websense/example-sky-websense.csc b/examples/platform-specific/sky-websense/example-sky-websense.csc
similarity index 100%
rename from examples/ipv6/sky-websense/example-sky-websense.csc
rename to examples/platform-specific/sky-websense/example-sky-websense.csc
diff --git a/examples/ipv6/sky-websense/project-conf.h b/examples/platform-specific/sky-websense/project-conf.h
similarity index 100%
rename from examples/ipv6/sky-websense/project-conf.h
rename to examples/platform-specific/sky-websense/project-conf.h
diff --git a/examples/ipv6/sky-websense/sky-websense.c b/examples/platform-specific/sky-websense/sky-websense.c
similarity index 100%
rename from examples/ipv6/sky-websense/sky-websense.c
rename to examples/platform-specific/sky-websense/sky-websense.c
diff --git a/examples/ipv6/sky-websense/websense-remote.c b/examples/platform-specific/sky-websense/websense-remote.c
similarity index 100%
rename from examples/ipv6/sky-websense/websense-remote.c
rename to examples/platform-specific/sky-websense/websense-remote.c
diff --git a/examples/ipv6/sky-websense/wget.c b/examples/platform-specific/sky-websense/wget.c
similarity index 100%
rename from examples/ipv6/sky-websense/wget.c
rename to examples/platform-specific/sky-websense/wget.c
diff --git a/examples/ipv6/sky-websense/wget.h b/examples/platform-specific/sky-websense/wget.h
similarity index 100%
rename from examples/ipv6/sky-websense/wget.h
rename to examples/platform-specific/sky-websense/wget.h
diff --git a/examples/zolertia/z1/Makefile b/examples/platform-specific/zolertia/z1/Makefile
similarity index 96%
rename from examples/zolertia/z1/Makefile
rename to examples/platform-specific/zolertia/z1/Makefile
index 70a107e7541cf37f3569fe0f980ef0e9c4746d4a..abf943818edbea93f3ec77ebdb5647f0b17f7f75 100644
--- a/examples/zolertia/z1/Makefile
+++ b/examples/platform-specific/zolertia/z1/Makefile
@@ -18,6 +18,6 @@ CONTIKI_PROJECT += test-potent
 endif
 
 all: $(CONTIKI_PROJECT)
-CONTIKI = ../../..
+CONTIKI = ../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/z1/ipv6/z1-websense/Makefile b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/Makefile
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/Makefile
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/Makefile
diff --git a/examples/zolertia/z1/ipv6/z1-websense/Makefile.target b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/Makefile.target
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/Makefile.target
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/Makefile.target
diff --git a/examples/zolertia/z1/ipv6/z1-websense/README.md b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/README.md
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/README.md
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/README.md
diff --git a/examples/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
diff --git a/examples/zolertia/z1/ipv6/z1-websense/project-conf.h b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/project-conf.h
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/project-conf.h
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/project-conf.h
diff --git a/examples/zolertia/z1/ipv6/z1-websense/websense-remote.c b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/websense-remote.c
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/websense-remote.c
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/websense-remote.c
diff --git a/examples/zolertia/z1/ipv6/z1-websense/wget.c b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/wget.c
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/wget.c
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/wget.c
diff --git a/examples/zolertia/z1/ipv6/z1-websense/wget.h b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/wget.h
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/wget.h
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/wget.h
diff --git a/examples/zolertia/z1/ipv6/z1-websense/z1-websense.c b/examples/platform-specific/zolertia/z1/ipv6/z1-websense/z1-websense.c
similarity index 100%
rename from examples/zolertia/z1/ipv6/z1-websense/z1-websense.c
rename to examples/platform-specific/zolertia/z1/ipv6/z1-websense/z1-websense.c
diff --git a/examples/zolertia/z1/test-adxl345.c b/examples/platform-specific/zolertia/z1/test-adxl345.c
similarity index 100%
rename from examples/zolertia/z1/test-adxl345.c
rename to examples/platform-specific/zolertia/z1/test-adxl345.c
diff --git a/examples/zolertia/z1/test-battery.c b/examples/platform-specific/zolertia/z1/test-battery.c
similarity index 100%
rename from examples/zolertia/z1/test-battery.c
rename to examples/platform-specific/zolertia/z1/test-battery.c
diff --git a/examples/zolertia/z1/test-light-ziglet.c b/examples/platform-specific/zolertia/z1/test-light-ziglet.c
similarity index 100%
rename from examples/zolertia/z1/test-light-ziglet.c
rename to examples/platform-specific/zolertia/z1/test-light-ziglet.c
diff --git a/examples/zolertia/z1/test-phidgets.c b/examples/platform-specific/zolertia/z1/test-phidgets.c
similarity index 100%
rename from examples/zolertia/z1/test-phidgets.c
rename to examples/platform-specific/zolertia/z1/test-phidgets.c
diff --git a/examples/zolertia/z1/test-potent.c b/examples/platform-specific/zolertia/z1/test-potent.c
similarity index 100%
rename from examples/zolertia/z1/test-potent.c
rename to examples/platform-specific/zolertia/z1/test-potent.c
diff --git a/examples/zolertia/z1/test-reed-sensor.c b/examples/platform-specific/zolertia/z1/test-reed-sensor.c
similarity index 100%
rename from examples/zolertia/z1/test-reed-sensor.c
rename to examples/platform-specific/zolertia/z1/test-reed-sensor.c
diff --git a/examples/zolertia/z1/test-relay-phidget.c b/examples/platform-specific/zolertia/z1/test-relay-phidget.c
similarity index 100%
rename from examples/zolertia/z1/test-relay-phidget.c
rename to examples/platform-specific/zolertia/z1/test-relay-phidget.c
diff --git a/examples/zolertia/z1/test-sht11.c b/examples/platform-specific/zolertia/z1/test-sht11.c
similarity index 100%
rename from examples/zolertia/z1/test-sht11.c
rename to examples/platform-specific/zolertia/z1/test-sht11.c
diff --git a/examples/zolertia/z1/test-sht25.c b/examples/platform-specific/zolertia/z1/test-sht25.c
similarity index 100%
rename from examples/zolertia/z1/test-sht25.c
rename to examples/platform-specific/zolertia/z1/test-sht25.c
diff --git a/examples/zolertia/z1/test-tlc59116.c b/examples/platform-specific/zolertia/z1/test-tlc59116.c
similarity index 100%
rename from examples/zolertia/z1/test-tlc59116.c
rename to examples/platform-specific/zolertia/z1/test-tlc59116.c
diff --git a/examples/zolertia/z1/test-tmp102.c b/examples/platform-specific/zolertia/z1/test-tmp102.c
similarity index 100%
rename from examples/zolertia/z1/test-tmp102.c
rename to examples/platform-specific/zolertia/z1/test-tmp102.c
diff --git a/examples/zolertia/zoul/Makefile b/examples/platform-specific/zolertia/zoul/Makefile
similarity index 97%
rename from examples/zolertia/zoul/Makefile
rename to examples/platform-specific/zolertia/zoul/Makefile
index f871d647fe1703f981f3dd5900c9d5e4ab831052..cd016fd1c8ec05e411f001d7ec86ae9b13ea026d 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/platform-specific/zolertia/zoul/Makefile
@@ -17,6 +17,6 @@ MODULES += drivers//dev/bme280
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../..
+CONTIKI = ../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/Makefile.target b/examples/platform-specific/zolertia/zoul/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/Makefile.target
rename to examples/platform-specific/zolertia/zoul/Makefile.target
diff --git a/examples/zolertia/zoul/README.md b/examples/platform-specific/zolertia/zoul/README.md
similarity index 100%
rename from examples/zolertia/zoul/README.md
rename to examples/platform-specific/zolertia/zoul/README.md
diff --git a/examples/zolertia/zoul/at-test/Makefile b/examples/platform-specific/zolertia/zoul/at-test/Makefile
similarity index 100%
rename from examples/zolertia/zoul/at-test/Makefile
rename to examples/platform-specific/zolertia/zoul/at-test/Makefile
diff --git a/examples/zolertia/zoul/at-test/at-master-test.c b/examples/platform-specific/zolertia/zoul/at-test/at-master-test.c
similarity index 100%
rename from examples/zolertia/zoul/at-test/at-master-test.c
rename to examples/platform-specific/zolertia/zoul/at-test/at-master-test.c
diff --git a/examples/zolertia/zoul/at-test/project-conf.h b/examples/platform-specific/zolertia/zoul/at-test/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/at-test/project-conf.h
rename to examples/platform-specific/zolertia/zoul/at-test/project-conf.h
diff --git a/examples/zolertia/zoul/cc1200-demo/Makefile b/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
similarity index 84%
rename from examples/zolertia/zoul/cc1200-demo/Makefile
rename to examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
index 4a1a9e4acf8926745268cdc578c2c4365b6a1e09..97411fd19293eb7f8e2977d816755084482c9ac0 100644
--- a/examples/zolertia/zoul/cc1200-demo/Makefile
+++ b/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
@@ -3,6 +3,6 @@ CONTIKI_PROJECT = cc1200-demo
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/cc1200-demo/Makefile.target b/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/cc1200-demo/Makefile.target
rename to examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target
diff --git a/examples/zolertia/zoul/cc1200-demo/cc1200-demo.c b/examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c
similarity index 100%
rename from examples/zolertia/zoul/cc1200-demo/cc1200-demo.c
rename to examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c
diff --git a/examples/zolertia/zoul/cc1200-demo/project-conf.h b/examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/cc1200-demo/project-conf.h
rename to examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h
diff --git a/examples/zolertia/zoul/node-red/README.md b/examples/platform-specific/zolertia/zoul/node-red/README.md
similarity index 100%
rename from examples/zolertia/zoul/node-red/README.md
rename to examples/platform-specific/zolertia/zoul/node-red/README.md
diff --git a/examples/zolertia/zoul/node-red/mqtt-remote-demo.json b/examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json
similarity index 100%
rename from examples/zolertia/zoul/node-red/mqtt-remote-demo.json
rename to examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json
diff --git a/examples/zolertia/zoul/orion/README.md b/examples/platform-specific/zolertia/zoul/orion/README.md
similarity index 100%
rename from examples/zolertia/zoul/orion/README.md
rename to examples/platform-specific/zolertia/zoul/orion/README.md
diff --git a/examples/zolertia/zoul/orion/client/Makefile b/examples/platform-specific/zolertia/zoul/orion/client/Makefile
similarity index 88%
rename from examples/zolertia/zoul/orion/client/Makefile
rename to examples/platform-specific/zolertia/zoul/orion/client/Makefile
index 51b6bea473fd0d8b66888c1507ed852a6e6b0f68..2f9cc4de3f29d336a339fe630ddf1ea40e5cd9fa 100644
--- a/examples/zolertia/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zolertia/zoul/orion/client/Makefile
@@ -8,5 +8,5 @@ MODULES += core/net/http-socket
 
 WITH_IP64 = 1
 
-CONTIKI = ../../../../..
+CONTIKI = ../../../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/orion/client/client.c b/examples/platform-specific/zolertia/zoul/orion/client/client.c
similarity index 100%
rename from examples/zolertia/zoul/orion/client/client.c
rename to examples/platform-specific/zolertia/zoul/orion/client/client.c
diff --git a/examples/zolertia/zoul/orion/client/ifttt-client.c b/examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c
similarity index 100%
rename from examples/zolertia/zoul/orion/client/ifttt-client.c
rename to examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c
diff --git a/examples/zolertia/zoul/orion/client/project-conf.h b/examples/platform-specific/zolertia/zoul/orion/client/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/orion/client/project-conf.h
rename to examples/platform-specific/zolertia/zoul/orion/client/project-conf.h
diff --git a/examples/zolertia/zoul/orion/ip64-router/Makefile b/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
similarity index 88%
rename from examples/zolertia/zoul/orion/ip64-router/Makefile
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
index 468376e66ec90fd6a413830a9745893e743f58c1..58ef9e74cdacd48d01a305e74e344d2ccf8bf6fb 100644
--- a/examples/zolertia/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
@@ -4,7 +4,7 @@ all: ip64-router
 
 BOARD = orion
 
-CONTIKI = ../../../../..
+CONTIKI = ../../../../../..
 
 WITH_IP64 = 1
 CONTIKI_WITH_IPV6 = 1
diff --git a/examples/zolertia/zoul/orion/ip64-router/Makefile.target b/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/orion/ip64-router/Makefile.target
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target
diff --git a/examples/zolertia/zoul/orion/ip64-router/httpd-simple.c b/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c
similarity index 100%
rename from examples/zolertia/zoul/orion/ip64-router/httpd-simple.c
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c
diff --git a/examples/zolertia/zoul/orion/ip64-router/httpd-simple.h b/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h
similarity index 100%
rename from examples/zolertia/zoul/orion/ip64-router/httpd-simple.h
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h
diff --git a/examples/zolertia/zoul/orion/ip64-router/ip64-router.c b/examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c
similarity index 100%
rename from examples/zolertia/zoul/orion/ip64-router/ip64-router.c
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c
diff --git a/examples/zolertia/zoul/orion/ip64-router/project-conf.h b/examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/orion/ip64-router/project-conf.h
rename to examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h
diff --git a/examples/zolertia/zoul/project-conf.h b/examples/platform-specific/zolertia/zoul/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/project-conf.h
rename to examples/platform-specific/zolertia/zoul/project-conf.h
diff --git a/examples/zolertia/zoul/rev-a/Makefile b/examples/platform-specific/zolertia/zoul/rev-a/Makefile
similarity index 86%
rename from examples/zolertia/zoul/rev-a/Makefile
rename to examples/platform-specific/zolertia/zoul/rev-a/Makefile
index bf3c06f7472610b255054a14b62f36559a53b809..4c18f17b9a1f050414237a8952d482edefd00bde 100644
--- a/examples/zolertia/zoul/rev-a/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rev-a/Makefile
@@ -4,6 +4,6 @@ CONTIKI_PROJECT = test-power-mgmt
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/rev-a/Makefile.target b/examples/platform-specific/zolertia/zoul/rev-a/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/rev-a/Makefile.target
rename to examples/platform-specific/zolertia/zoul/rev-a/Makefile.target
diff --git a/examples/zolertia/zoul/rev-a/project-conf.h b/examples/platform-specific/zolertia/zoul/rev-a/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/rev-a/project-conf.h
rename to examples/platform-specific/zolertia/zoul/rev-a/project-conf.h
diff --git a/examples/zolertia/zoul/rev-a/test-power-mgmt.c b/examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c
similarity index 100%
rename from examples/zolertia/zoul/rev-a/test-power-mgmt.c
rename to examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c
diff --git a/examples/zolertia/zoul/rev-b/Makefile b/examples/platform-specific/zolertia/zoul/rev-b/Makefile
similarity index 88%
rename from examples/zolertia/zoul/rev-b/Makefile
rename to examples/platform-specific/zolertia/zoul/rev-b/Makefile
index 882591218f118685d65f95fc30c5caff9f1230e7..6c5e5834d561af8abb5d4469f1d52dfa97d29999 100644
--- a/examples/zolertia/zoul/rev-b/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rev-b/Makefile
@@ -6,6 +6,6 @@ BOARD ?= remote-revb
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/rev-b/Makefile.target b/examples/platform-specific/zolertia/zoul/rev-b/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/rev-b/Makefile.target
rename to examples/platform-specific/zolertia/zoul/rev-b/Makefile.target
diff --git a/examples/zolertia/zoul/rev-b/project-conf.h b/examples/platform-specific/zolertia/zoul/rev-b/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/rev-b/project-conf.h
rename to examples/platform-specific/zolertia/zoul/rev-b/project-conf.h
diff --git a/examples/zolertia/zoul/rev-b/test-power-mgmt.c b/examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c
similarity index 100%
rename from examples/zolertia/zoul/rev-b/test-power-mgmt.c
rename to examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c
diff --git a/examples/zolertia/zoul/rtcc/Makefile b/examples/platform-specific/zolertia/zoul/rtcc/Makefile
similarity index 85%
rename from examples/zolertia/zoul/rtcc/Makefile
rename to examples/platform-specific/zolertia/zoul/rtcc/Makefile
index 91b0aecf1cc7d75a5e9fd481c92f1ba55a3d09ef..d0ddaaf1e67b58b13aa38e9f68abfe3182475562 100644
--- a/examples/zolertia/zoul/rtcc/Makefile
+++ b/examples/platform-specific/zolertia/zoul/rtcc/Makefile
@@ -5,5 +5,5 @@ TARGET = zoul
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/zolertia/zoul/rtcc/Makefile.target b/examples/platform-specific/zolertia/zoul/rtcc/Makefile.target
similarity index 100%
rename from examples/zolertia/zoul/rtcc/Makefile.target
rename to examples/platform-specific/zolertia/zoul/rtcc/Makefile.target
diff --git a/examples/zolertia/zoul/rtcc/project-conf.h b/examples/platform-specific/zolertia/zoul/rtcc/project-conf.h
similarity index 100%
rename from examples/zolertia/zoul/rtcc/project-conf.h
rename to examples/platform-specific/zolertia/zoul/rtcc/project-conf.h
diff --git a/examples/zolertia/zoul/rtcc/test-rtcc.c b/examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c
similarity index 100%
rename from examples/zolertia/zoul/rtcc/test-rtcc.c
rename to examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c
diff --git a/examples/zolertia/zoul/test-aac-sensor.c b/examples/platform-specific/zolertia/zoul/test-aac-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-aac-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-aac-sensor.c
diff --git a/examples/zolertia/zoul/test-ac-dimmer.c b/examples/platform-specific/zolertia/zoul/test-ac-dimmer.c
similarity index 100%
rename from examples/zolertia/zoul/test-ac-dimmer.c
rename to examples/platform-specific/zolertia/zoul/test-ac-dimmer.c
diff --git a/examples/zolertia/zoul/test-bme280.c b/examples/platform-specific/zolertia/zoul/test-bme280.c
similarity index 100%
rename from examples/zolertia/zoul/test-bme280.c
rename to examples/platform-specific/zolertia/zoul/test-bme280.c
diff --git a/examples/zolertia/zoul/test-bmp085-bmp180.c b/examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c
similarity index 100%
rename from examples/zolertia/zoul/test-bmp085-bmp180.c
rename to examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c
diff --git a/examples/zolertia/zoul/test-dht22.c b/examples/platform-specific/zolertia/zoul/test-dht22.c
similarity index 100%
rename from examples/zolertia/zoul/test-dht22.c
rename to examples/platform-specific/zolertia/zoul/test-dht22.c
diff --git a/examples/zolertia/zoul/test-grove-gyro.c b/examples/platform-specific/zolertia/zoul/test-grove-gyro.c
similarity index 100%
rename from examples/zolertia/zoul/test-grove-gyro.c
rename to examples/platform-specific/zolertia/zoul/test-grove-gyro.c
diff --git a/examples/zolertia/zoul/test-grove-light-sensor.c b/examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-grove-light-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c
diff --git a/examples/zolertia/zoul/test-grove-loudness-sensor.c b/examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-grove-loudness-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c
diff --git a/examples/zolertia/zoul/test-iaq.c b/examples/platform-specific/zolertia/zoul/test-iaq.c
similarity index 100%
rename from examples/zolertia/zoul/test-iaq.c
rename to examples/platform-specific/zolertia/zoul/test-iaq.c
diff --git a/examples/zolertia/zoul/test-lcd.c b/examples/platform-specific/zolertia/zoul/test-lcd.c
similarity index 100%
rename from examples/zolertia/zoul/test-lcd.c
rename to examples/platform-specific/zolertia/zoul/test-lcd.c
diff --git a/examples/zolertia/zoul/test-motion.c b/examples/platform-specific/zolertia/zoul/test-motion.c
similarity index 100%
rename from examples/zolertia/zoul/test-motion.c
rename to examples/platform-specific/zolertia/zoul/test-motion.c
diff --git a/examples/zolertia/zoul/test-pm10-sensor.c b/examples/platform-specific/zolertia/zoul/test-pm10-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-pm10-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-pm10-sensor.c
diff --git a/examples/zolertia/zoul/test-relay.c b/examples/platform-specific/zolertia/zoul/test-relay.c
similarity index 100%
rename from examples/zolertia/zoul/test-relay.c
rename to examples/platform-specific/zolertia/zoul/test-relay.c
diff --git a/examples/zolertia/zoul/test-rotation-sensor.c b/examples/platform-specific/zolertia/zoul/test-rotation-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-rotation-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-rotation-sensor.c
diff --git a/examples/zolertia/zoul/test-servo.c b/examples/platform-specific/zolertia/zoul/test-servo.c
similarity index 100%
rename from examples/zolertia/zoul/test-servo.c
rename to examples/platform-specific/zolertia/zoul/test-servo.c
diff --git a/examples/zolertia/zoul/test-sht25.c b/examples/platform-specific/zolertia/zoul/test-sht25.c
similarity index 100%
rename from examples/zolertia/zoul/test-sht25.c
rename to examples/platform-specific/zolertia/zoul/test-sht25.c
diff --git a/examples/zolertia/zoul/test-tsl256x.c b/examples/platform-specific/zolertia/zoul/test-tsl256x.c
similarity index 100%
rename from examples/zolertia/zoul/test-tsl256x.c
rename to examples/platform-specific/zolertia/zoul/test-tsl256x.c
diff --git a/examples/zolertia/zoul/test-vac-sensor.c b/examples/platform-specific/zolertia/zoul/test-vac-sensor.c
similarity index 100%
rename from examples/zolertia/zoul/test-vac-sensor.c
rename to examples/platform-specific/zolertia/zoul/test-vac-sensor.c
diff --git a/examples/zolertia/zoul/test-weather-meter.c b/examples/platform-specific/zolertia/zoul/test-weather-meter.c
similarity index 100%
rename from examples/zolertia/zoul/test-weather-meter.c
rename to examples/platform-specific/zolertia/zoul/test-weather-meter.c
diff --git a/examples/zolertia/zoul/test-zonik.c b/examples/platform-specific/zolertia/zoul/test-zonik.c
similarity index 100%
rename from examples/zolertia/zoul/test-zonik.c
rename to examples/platform-specific/zolertia/zoul/test-zonik.c
diff --git a/examples/zolertia/zoul/zoul-demo.c b/examples/platform-specific/zolertia/zoul/zoul-demo.c
similarity index 100%
rename from examples/zolertia/zoul/zoul-demo.c
rename to examples/platform-specific/zolertia/zoul/zoul-demo.c
diff --git a/regression-tests/01-compile-base/Makefile b/regression-tests/01-compile-base/Makefile
index d3ea875fa7e68b373677322bb375722e2cc47d0d..8349064363fa21014777aa9d591546c23eece4ef 100644
--- a/regression-tests/01-compile-base/Makefile
+++ b/regression-tests/01-compile-base/Makefile
@@ -7,9 +7,9 @@ hello-world/sky \
 hello-world/wismote \
 hello-world/z1 \
 eeprom-test/native \
-er-rest-example/wismote \
+ipv6/er-rest-example/wismote \
 ipso-objects/wismote \
-zolertia/z1/z1 \
+platform-specific/zolertia/z1/z1 \
 ipv6/multicast/sky \
 sensniff/z1 \
 
diff --git a/regression-tests/02-compile-arm-ports/Makefile b/regression-tests/02-compile-arm-ports/Makefile
index a704d636670c58c879cb562320492b151530c2ea..b8902da89770628b75ff8f7c9a7a66b05b54edfd 100644
--- a/regression-tests/02-compile-arm-ports/Makefile
+++ b/regression-tests/02-compile-arm-ports/Makefile
@@ -2,32 +2,32 @@ EXAMPLESDIR=../../examples
 TOOLSDIR=../../tools
 
 EXAMPLES = \
-cc26xx/cc26xx-web-demo/srf06-cc26xx \
-cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc1350 \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
-cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
-cc26xx/very-sleepy-demo/srf06-cc26xx \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx \
+platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc1350 \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
+platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
+platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 ipv6/rpl-border-router/cc2538dk \
 ipv6/rpl-border-router/cc2538dk:MAKE_WITH_NON_STORING=1 \
-er-rest-example/cc2538dk \
+ipv6/er-rest-example/cc2538dk \
 ipso-objects/cc2538dk \
-cc2538dk/udp-ipv6-echo-server/cc2538dk \
+platform-specific/cc2538dk/udp-ipv6-echo-server/cc2538dk \
 ipv6/multicast/cc2538dk \
-cc2538-common/cc2538dk \
-cc2538-common/mqtt-demo/cc2538dk \
-cc2538-common/crypto/cc2538dk \
-cc2538-common/pka/cc2538dk \
-cc2538-common/zoul \
-cc2538-common/mqtt-demo/zoul \
-cc2538-common/crypto/zoul \
-cc2538-common/pka/zoul \
-zolertia/zoul/orion/ip64-router/zoul:BOARD=orion \
-er-rest-example/zoul \
+platform-specific/cc2538-common/cc2538dk \
+platform-specific/cc2538-common/mqtt-demo/cc2538dk \
+platform-specific/cc2538-common/crypto/cc2538dk \
+platform-specific/cc2538-common/pka/cc2538dk \
+platform-specific/cc2538-common/zoul \
+platform-specific/cc2538-common/mqtt-demo/zoul \
+platform-specific/cc2538-common/crypto/zoul \
+platform-specific/cc2538-common/pka/zoul \
+platform-specific/zolertia/zoul/orion/ip64-router/zoul:BOARD=orion \
+ipv6/er-rest-example/zoul \
 ipso-objects/zoul \
 hello-world/zoul \
 sensniff/cc2538dk \
diff --git a/regression-tests/03-compile-nxp-ports/Makefile b/regression-tests/03-compile-nxp-ports/Makefile
index 990361287feb760522bc245e49bf71ade818a941..278378109782a863ba159e62aec32a92252e26be 100644
--- a/regression-tests/03-compile-nxp-ports/Makefile
+++ b/regression-tests/03-compile-nxp-ports/Makefile
@@ -4,17 +4,17 @@ TOOLSDIR=../../tools
 # build jn516x examples, covering IPv6, RPL, CoAP, Rime, Nullrdc, Contikimac
 EXAMPLES = \
 hello-world/jn516x \
-jn516x/dr1175-sensors/jn516x \
-jn516x/rpl/border-router/jn516x \
-jn516x/rpl/node/jn516x \
-jn516x/rpl/coap-dongle-node/jn516x \
-jn516x/rpl/coap-dr1175-node/jn516x \
-jn516x/rpl/coap-dr1199-node/jn516x \
-jn516x/tsch/simple-sensor-network/node/jn516x \
-jn516x/tsch/simple-sensor-network/rpl-border-router/jn516x \
-jn516x/tsch/tx-power-verification/node/jn516x \
-jn516x/tsch/tx-power-verification/rpl-border-router/jn516x \
-jn516x/tsch/uart1-test-node/jn516x \
+platform-specific/jn516x/dr1175-sensors/jn516x \
+platform-specific/jn516x/rpl/border-router/jn516x \
+platform-specific/jn516x/rpl/node/jn516x \
+platform-specific/jn516x/rpl/coap-dongle-node/jn516x \
+platform-specific/jn516x/rpl/coap-dr1175-node/jn516x \
+platform-specific/jn516x/rpl/coap-dr1199-node/jn516x \
+platform-specific/jn516x/tsch/simple-sensor-network/node/jn516x \
+platform-specific/jn516x/tsch/tx-power-verification/node/jn516x \
+platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/jn516x \
+platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/jn516x \
+platform-specific/jn516x/tsch/uart1-test-node/jn516x \
 sensniff/jn516x \
 ipv6/rpl-tsch/jn516x \
 ipv6/rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \
diff --git a/regression-tests/04-compile-nrf52-ports/Makefile b/regression-tests/04-compile-nrf52-ports/Makefile
index bdf5b4a047b0ebf273d14bbfc3ec3643726bb7ae..bb36db060ac5eab33b8647bfe64ff401f546ac1e 100644
--- a/regression-tests/04-compile-nrf52-ports/Makefile
+++ b/regression-tests/04-compile-nrf52-ports/Makefile
@@ -8,11 +8,11 @@ TOOLSDIR=../../tools
  
 EXAMPLES = \
 hello-world/nrf52dk \
-nrf52dk/coap-demo/nrf52dk:coap-server \
-nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
-nrf52dk/mqtt-demo/nrf52dk \
-nrf52dk/blink-hello/nrf52dk \
-nrf52dk/timer-test/nrf52dk
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-server \
+platform-specific/nrf52dk/coap-demo/nrf52dk:coap-client:SERVER_IPV6_ADDR=ffff \
+platform-specific/nrf52dk/mqtt-demo/nrf52dk \
+platform-specific/nrf52dk/blink-hello/nrf52dk \
+platform-specific/nrf52dk/timer-test/nrf52dk
 
 TOOLS=
 
diff --git a/regression-tests/08-ipv6/01-cooja-ipv6-udp.csc b/regression-tests/08-ipv6/01-cooja-ipv6-udp.csc
index ff00b5bc3dad4ed2f9ab38b5abc0de94a1f8a768..f1103317cb43dcd8ff0259f2a044f4e75409de71 100644
--- a/regression-tests/08-ipv6/01-cooja-ipv6-udp.csc
+++ b/regression-tests/08-ipv6/01-cooja-ipv6-udp.csc
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype350</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/examples/udp-ipv6/udp-server.c</source>
+      <source>[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-server.c</source>
       <commands>make TARGET=cooja clean
 make udp-server.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
@@ -49,7 +49,7 @@ make udp-server.cooja TARGET=cooja</commands>
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype981</identifier>
       <description>Sender</description>
-      <source>[CONTIKI_DIR]/examples/udp-ipv6/udp-client.c</source>
+      <source>[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-client.c</source>
       <commands>make udp-client.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
diff --git a/regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc b/regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc
index f3c99664ed7c40fccf84cddaaf92c12a669d292c..a8afc751ac8a49b4a79a8c9724e5cf4140917e9b 100644
--- a/regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc
+++ b/regression-tests/08-ipv6/x03-sky-ipv6-udp-fragmentation.csc
@@ -24,10 +24,10 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>UDP client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/udp-ipv6/udp-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-client.c</source>
       <commands EXPORT="discard">make clean TARGET=sky
 make udp-client.sky TARGET=sky DEFINES=UDP_CONNECTION_ADDR=fe80::212:7402:2:202,SICSLOWPAN_CONF_FRAG=1,SEND_TOO_LARGE_PACKET_TO_TEST_FRAGMENTATION=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/udp-ipv6/udp-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -48,9 +48,9 @@ make udp-client.sky TARGET=sky DEFINES=UDP_CONNECTION_ADDR=fe80::212:7402:2:202,
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky2</identifier>
       <description>UDP server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/udp-ipv6/udp-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-server.c</source>
       <commands EXPORT="discard">make udp-server.sky TARGET=sky DEFINES=SICSLOWPAN_CONF_FRAG=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/udp-ipv6/udp-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/udp-ipv6/udp-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>