diff --git a/examples/ipv6/rpl-tsch/Makefile b/examples/rpl-tsch/Makefile
similarity index 97%
rename from examples/ipv6/rpl-tsch/Makefile
rename to examples/rpl-tsch/Makefile
index e6cb76944..ddd2360f8 100644
--- a/examples/ipv6/rpl-tsch/Makefile
+++ b/examples/rpl-tsch/Makefile
@@ -1,7 +1,7 @@
CONTIKI_PROJECT = node
all: $(CONTIKI_PROJECT)
-CONTIKI=../../..
+CONTIKI=../..
MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
MAKE_WITH_SECURITY ?= 0 # force Security from command line
diff --git a/examples/ipv6/rpl-tsch/README.md b/examples/rpl-tsch/README.md
similarity index 100%
rename from examples/ipv6/rpl-tsch/README.md
rename to examples/rpl-tsch/README.md
diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/rpl-tsch/node.c
similarity index 100%
rename from examples/ipv6/rpl-tsch/node.c
rename to examples/rpl-tsch/node.c
diff --git a/examples/ipv6/rpl-tsch/project-conf.h b/examples/rpl-tsch/project-conf.h
similarity index 100%
rename from examples/ipv6/rpl-tsch/project-conf.h
rename to examples/rpl-tsch/project-conf.h
diff --git a/examples/ipv6/rpl-tsch/rpl-tsch-cooja.csc b/examples/rpl-tsch/rpl-tsch-cooja.csc
similarity index 99%
rename from examples/ipv6/rpl-tsch/rpl-tsch-cooja.csc
rename to examples/rpl-tsch/rpl-tsch-cooja.csc
index 3364b43fd..64dca6559 100644
--- a/examples/ipv6/rpl-tsch/rpl-tsch-cooja.csc
+++ b/examples/rpl-tsch/rpl-tsch-cooja.csc
@@ -25,7 +25,7 @@
org.contikios.cooja.contikimote.ContikiMoteType
mtype660
RPL/TSCH Node
- [CONTIKI_DIR]/examples/ipv6/rpl-tsch/node.c
+ [CONTIKI_DIR]/examples/rpl-tsch/node.c
make TARGET=cooja clean
make TARGET=cooja node.cooja
org.contikios.cooja.interfaces.Position
diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile
index 02fb871cb..8e6e8cadd 100644
--- a/tests/02-compile-arm-ports/Makefile
+++ b/tests/02-compile-arm-ports/Makefile
@@ -39,9 +39,9 @@ sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
cfs-coffee/cc2538dk \
cfs-coffee/openmote-cc2538 \
cfs-coffee/zoul \
-ipv6/rpl-tsch/zoul \
-ipv6/rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
-ipv6/rpl-tsch/zoul:MAKE_WITH_SECURITY=1 \
+rpl-tsch/zoul \
+rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
+rpl-tsch/zoul:MAKE_WITH_SECURITY=1 \
logging/zoul \
6tisch/etsi-plugtest-2017/zoul:BOARD=remote \
6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650
diff --git a/tests/03-compile-nxp-ports/Makefile b/tests/03-compile-nxp-ports/Makefile
index 0672f9786..87f7b0f1d 100644
--- a/tests/03-compile-nxp-ports/Makefile
+++ b/tests/03-compile-nxp-ports/Makefile
@@ -16,9 +16,9 @@ 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 \
-ipv6/rpl-tsch/jn516x:MAKE_WITH_SECURITY=1 \
+rpl-tsch/jn516x \
+rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \
+rpl-tsch/jn516x:MAKE_WITH_SECURITY=1 \
logging/jn516x \
6tisch/etsi-plugtest-2017/jn516x
diff --git a/tests/08-ipv6/19-cooja-rpl-tsch.csc b/tests/08-ipv6/19-cooja-rpl-tsch.csc
index 97f4dd798..e2e3737bf 100644
--- a/tests/08-ipv6/19-cooja-rpl-tsch.csc
+++ b/tests/08-ipv6/19-cooja-rpl-tsch.csc
@@ -24,7 +24,7 @@
org.contikios.cooja.contikimote.ContikiMoteType
mtype1
Cooja Mote Type #mtype1
- [CONTIKI_DIR]/examples/ipv6/rpl-tsch/node.c
+ [CONTIKI_DIR]/examples/rpl-tsch/node.c
make TARGET=cooja clean
make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1
org.contikios.cooja.interfaces.Position
diff --git a/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc b/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc
index 676d86366..7a529c880 100644
--- a/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc
+++ b/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc
@@ -24,11 +24,11 @@
org.contikios.cooja.contikimote.ContikiMoteType
mtype11
Cooja Mote Type #mtype11
- [CONTIKI_DIR]/examples/ipv6/rpl-tsch/node.c
+ [CONTIKI_DIR]/examples/rpl-tsch/node.c
make TARGET=cooja clean
make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1
[CONTIKI_DIR]/examples/ipv6/rpl-tsch/node.mtype1
+ EXPORT="copy">[CONTIKI_DIR]/examples/rpl-tsch/node.mtype1
org.contikios.cooja.interfaces.Position
org.contikios.cooja.interfaces.Battery
org.contikios.cooja.contikimote.interfaces.ContikiVib
diff --git a/tests/08-ipv6/21-cooja-rpl-tsch-security.csc b/tests/08-ipv6/21-cooja-rpl-tsch-security.csc
index ffa370b01..d2ff6b9c3 100644
--- a/tests/08-ipv6/21-cooja-rpl-tsch-security.csc
+++ b/tests/08-ipv6/21-cooja-rpl-tsch-security.csc
@@ -24,7 +24,7 @@
org.contikios.cooja.contikimote.ContikiMoteType
mtype11
Cooja Mote Type #mtype11
- [CONTIKI_DIR]/examples/ipv6/rpl-tsch/node.c
+ [CONTIKI_DIR]/examples/rpl-tsch/node.c
make TARGET=cooja clean
make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1 MAKE_WITH_PERIODIC_ROUTES_PRINT=1
org.contikios.cooja.interfaces.Position