diff --git a/examples/ipv6/multicast/Makefile b/examples/multicast/Makefile
similarity index 90%
rename from examples/ipv6/multicast/Makefile
rename to examples/multicast/Makefile
index 310177870..2337ea60f 100644
--- a/examples/ipv6/multicast/Makefile
+++ b/examples/multicast/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT = root intermediate sink
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../..
+CONTIKI = ../..
 
 MODULES += os/net/ipv6/multicast
 
diff --git a/examples/ipv6/multicast/intermediate.c b/examples/multicast/intermediate.c
similarity index 100%
rename from examples/ipv6/multicast/intermediate.c
rename to examples/multicast/intermediate.c
diff --git a/examples/ipv6/multicast/multicast.csc b/examples/multicast/multicast.csc
similarity index 95%
rename from examples/ipv6/multicast/multicast.csc
rename to examples/multicast/multicast.csc
index a0857c13b..e88913825 100644
--- a/examples/ipv6/multicast/multicast.csc
+++ b/examples/multicast/multicast.csc
@@ -24,9 +24,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky1</identifier>
       <description>root</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/multicast/root.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/multicast/root.c</source>
       <commands EXPORT="discard">make root.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/multicast/root.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/multicast/root.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>intermediate</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
       <commands EXPORT="discard">make intermediate.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/multicast/intermediate.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -70,9 +70,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>sky3</identifier>
       <description>sink</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/multicast/sink.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/multicast/sink.c</source>
       <commands EXPORT="discard">make sink.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/multicast/sink.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/multicast/sink.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/multicast/project-conf.h b/examples/multicast/project-conf.h
similarity index 100%
rename from examples/ipv6/multicast/project-conf.h
rename to examples/multicast/project-conf.h
diff --git a/examples/ipv6/multicast/root.c b/examples/multicast/root.c
similarity index 100%
rename from examples/ipv6/multicast/root.c
rename to examples/multicast/root.c
diff --git a/examples/ipv6/multicast/sink.c b/examples/multicast/sink.c
similarity index 100%
rename from examples/ipv6/multicast/sink.c
rename to examples/multicast/sink.c
diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index e429e78b5..322412b4e 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -5,7 +5,7 @@ EXAMPLES = \
 hello-world/native \
 hello-world/sky \
 eeprom-test/native \
-ipv6/multicast/sky \
+multicast/sky \
 logging/native \
 ipv6/rpl-udp/sky \
 
diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile
index 8e6e8cadd..bee5a35fb 100644
--- a/tests/02-compile-arm-ports/Makefile
+++ b/tests/02-compile-arm-ports/Makefile
@@ -17,7 +17,7 @@ ipv6/rpl-udp/cc2538dk \
 coap-example/cc2538dk \
 ipso-objects/cc2538dk \
 udp-echo-server/cc2538dk \
-ipv6/multicast/cc2538dk \
+multicast/cc2538dk \
 platform-specific/cc2538-common/cc2538dk \
 platform-specific/cc2538-common/mqtt-demo/cc2538dk \
 platform-specific/cc2538-common/crypto/cc2538dk \
diff --git a/tests/08-ipv6/15-cooja-multicast-11-hops-rollt-tm.csc b/tests/08-ipv6/15-cooja-multicast-11-hops-rollt-tm.csc
index c9bdd16be..8fdc9fcd9 100644
--- a/tests/08-ipv6/15-cooja-multicast-11-hops-rollt-tm.csc
+++ b/tests/08-ipv6/15-cooja-multicast-11-hops-rollt-tm.csc
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/root.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
       <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -48,7 +48,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype890</identifier>
       <description>Intermediate</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
       <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -72,7 +72,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype956</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/sink.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
       <commands>make sink.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ROLL_TM</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
diff --git a/tests/08-ipv6/16-cooja-multicast-11-hops-smrf.csc b/tests/08-ipv6/16-cooja-multicast-11-hops-smrf.csc
index 8ee4053bd..c99541032 100644
--- a/tests/08-ipv6/16-cooja-multicast-11-hops-smrf.csc
+++ b/tests/08-ipv6/16-cooja-multicast-11-hops-smrf.csc
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/root.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
       <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -48,7 +48,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype890</identifier>
       <description>Intermediate</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
       <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -72,7 +72,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype956</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/sink.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
       <commands>make sink.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_SMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
diff --git a/tests/08-ipv6/17-cooja-multicast-11-hops-esmrf.csc b/tests/08-ipv6/17-cooja-multicast-11-hops-esmrf.csc
index ea64b23e0..6c68043d1 100644
--- a/tests/08-ipv6/17-cooja-multicast-11-hops-esmrf.csc
+++ b/tests/08-ipv6/17-cooja-multicast-11-hops-esmrf.csc
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype612</identifier>
       <description>Root/sender</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/root.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
       <commands>make root.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -48,7 +48,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype890</identifier>
       <description>Intermediate</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
       <commands>make intermediate.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -72,7 +72,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype956</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/sink.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
       <commands>make sink.cooja TARGET=cooja DEFINES=UIP_MCAST6_CONF_ENGINE=UIP_MCAST6_ENGINE_ESMRF</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
diff --git a/tests/08-ipv6/18-cooja-multicast-31-hops.csc b/tests/08-ipv6/18-cooja-multicast-31-hops.csc
index 27321d624..1da00d7cf 100644
--- a/tests/08-ipv6/18-cooja-multicast-31-hops.csc
+++ b/tests/08-ipv6/18-cooja-multicast-31-hops.csc
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype816</identifier>
       <description>Root/sender</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/root.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/root.c</source>
       <commands>make root.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -48,7 +48,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype53</identifier>
       <description>Intermediate</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/intermediate.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/intermediate.c</source>
       <commands>make intermediate.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
@@ -72,7 +72,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype191</identifier>
       <description>Receiver</description>
-      <source>[CONTIKI_DIR]/examples/ipv6/multicast/sink.c</source>
+      <source>[CONTIKI_DIR]/examples/multicast/sink.c</source>
       <commands>make sink.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>