diff --git a/examples/ipv6/rpl-udp/Makefile.target b/examples/ipv6/rpl-udp/Makefile.target
deleted file mode 100644
index d56a50bcc..000000000
--- a/examples/ipv6/rpl-udp/Makefile.target
+++ /dev/null
@@ -1 +0,0 @@
-TARGET = sky
diff --git a/examples/packet-processing/packet-processing.csc b/examples/packet-processing/packet-processing.csc
index df3890ed5..11c5803dd 100644
--- a/examples/packet-processing/packet-processing.csc
+++ b/examples/packet-processing/packet-processing.csc
@@ -24,9 +24,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-server.c</source>
       <commands EXPORT="discard">make clean udp-server.sky TARGET=sky DEFINES=TEST_MORE_ROUTES=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/rpl-udp/Makefile
similarity index 91%
rename from examples/ipv6/rpl-udp/Makefile
rename to examples/rpl-udp/Makefile
index e871e6c8e..ec7a9819b 100644
--- a/examples/ipv6/rpl-udp/Makefile
+++ b/examples/rpl-udp/Makefile
@@ -1,5 +1,5 @@
 all: udp-client udp-server
-CONTIKI=../../..
+CONTIKI=../..
 
 ifdef SERVER_REPLY
 CFLAGS+=-DSERVER_REPLY=$(SERVER_REPLY)
diff --git a/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc b/examples/rpl-udp/rpl-udp-powertrace.csc
similarity index 98%
rename from examples/ipv6/rpl-udp/rpl-udp-powertrace.csc
rename to examples/rpl-udp/rpl-udp-powertrace.csc
index c92dc0800..78abdbd8d 100644
--- a/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc
+++ b/examples/rpl-udp/rpl-udp-powertrace.csc
@@ -23,9 +23,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-server.c</source>
       <commands EXPORT="discard">make udp-server.sky TARGET=sky WITH_COMPOWER=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
@@ -46,9 +46,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky2</identifier>
       <description>Sky Mote Type #sky2</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-client.c</source>
       <commands EXPORT="discard">make udp-client.sky TARGET=sky WITH_COMPOWER=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
diff --git a/examples/ipv6/rpl-udp/rpl-udp-scale.csc b/examples/rpl-udp/rpl-udp-scale.csc
similarity index 98%
rename from examples/ipv6/rpl-udp/rpl-udp-scale.csc
rename to examples/rpl-udp/rpl-udp-scale.csc
index 292e442c1..469bcca05 100644
--- a/examples/ipv6/rpl-udp/rpl-udp-scale.csc
+++ b/examples/rpl-udp/rpl-udp-scale.csc
@@ -24,9 +24,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-server.c</source>
       <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-server.sky TARGET=sky DEFINES=TEST_MORE_ROUTES=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
@@ -47,9 +47,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky2</identifier>
       <description>Sky Mote Type #sky2</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-client.c</source>
       <commands EXPORT="discard">make SERVER_REPLY=1 clean udp-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
diff --git a/examples/ipv6/rpl-udp/rpl-udp.csc b/examples/rpl-udp/rpl-udp.csc
similarity index 98%
rename from examples/ipv6/rpl-udp/rpl-udp.csc
rename to examples/rpl-udp/rpl-udp.csc
index 3aa9b270e..6aa1730b9 100644
--- a/examples/ipv6/rpl-udp/rpl-udp.csc
+++ b/examples/rpl-udp/rpl-udp.csc
@@ -24,9 +24,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>Sky Mote Type #sky1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-server.c</source>
       <commands EXPORT="discard">make clean udp-server.sky TARGET=sky DEFINES=TEST_MORE_ROUTES=1</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
@@ -47,9 +47,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky2</identifier>
       <description>Sky Mote Type #sky2</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-udp/udp-client.c</source>
       <commands EXPORT="discard">make clean udp-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-udp/udp-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/rpl-udp/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>
diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/rpl-udp/udp-client.c
similarity index 100%
rename from examples/ipv6/rpl-udp/udp-client.c
rename to examples/rpl-udp/udp-client.c
diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/rpl-udp/udp-server.c
similarity index 100%
rename from examples/ipv6/rpl-udp/udp-server.c
rename to examples/rpl-udp/udp-server.c
diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index 322412b4e..e8e165621 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -7,7 +7,7 @@ hello-world/sky \
 eeprom-test/native \
 multicast/sky \
 logging/native \
-ipv6/rpl-udp/sky \
+rpl-udp/sky \
 
 TOOLS=
 
diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile
index 35021b65c..11878ed03 100644
--- a/tests/02-compile-arm-ports/Makefile
+++ b/tests/02-compile-arm-ports/Makefile
@@ -13,7 +13,7 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
 platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 rpl-border-router/cc2538dk \
-ipv6/rpl-udp/cc2538dk \
+rpl-udp/cc2538dk \
 coap-example/cc2538dk \
 ipso-objects/cc2538dk \
 udp-echo-server/cc2538dk \