diff --git a/examples/platform-specific/zolertia/zoul/Makefile b/examples/platform-specific/zoul/Makefile
similarity index 97%
rename from examples/platform-specific/zolertia/zoul/Makefile
rename to examples/platform-specific/zoul/Makefile
index cd016fd1c..f871d647f 100644
--- a/examples/platform-specific/zolertia/zoul/Makefile
+++ b/examples/platform-specific/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/platform-specific/zolertia/zoul/Makefile.target b/examples/platform-specific/zoul/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/Makefile.target
rename to examples/platform-specific/zoul/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/README.md b/examples/platform-specific/zoul/README.md
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/README.md
rename to examples/platform-specific/zoul/README.md
diff --git a/examples/platform-specific/zolertia/zoul/at-test/Makefile b/examples/platform-specific/zoul/at-test/Makefile
similarity index 87%
rename from examples/platform-specific/zolertia/zoul/at-test/Makefile
rename to examples/platform-specific/zoul/at-test/Makefile
index 14ab8b54b..d26dcce3c 100644
--- a/examples/platform-specific/zolertia/zoul/at-test/Makefile
+++ b/examples/platform-specific/zoul/at-test/Makefile
@@ -3,5 +3,5 @@ CONTIKI_PROJECT = at-master-test
 APPS = at-master
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/zolertia/zoul/at-test/at-master-test.c b/examples/platform-specific/zoul/at-test/at-master-test.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/at-test/at-master-test.c
rename to examples/platform-specific/zoul/at-test/at-master-test.c
diff --git a/examples/platform-specific/zolertia/zoul/at-test/project-conf.h b/examples/platform-specific/zoul/at-test/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/at-test/project-conf.h
rename to examples/platform-specific/zoul/at-test/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile b/examples/platform-specific/zoul/cc1200-demo/Makefile
similarity index 84%
rename from examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
rename to examples/platform-specific/zoul/cc1200-demo/Makefile
index 97411fd19..76b1a2833 100644
--- a/examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile
+++ b/examples/platform-specific/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/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target b/examples/platform-specific/zoul/cc1200-demo/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/cc1200-demo/Makefile.target
rename to examples/platform-specific/zoul/cc1200-demo/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c b/examples/platform-specific/zoul/cc1200-demo/cc1200-demo.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/cc1200-demo/cc1200-demo.c
rename to examples/platform-specific/zoul/cc1200-demo/cc1200-demo.c
diff --git a/examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h b/examples/platform-specific/zoul/cc1200-demo/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/cc1200-demo/project-conf.h
rename to examples/platform-specific/zoul/cc1200-demo/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/node-red/README.md b/examples/platform-specific/zoul/node-red/README.md
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/node-red/README.md
rename to examples/platform-specific/zoul/node-red/README.md
diff --git a/examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json b/examples/platform-specific/zoul/node-red/mqtt-remote-demo.json
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/node-red/mqtt-remote-demo.json
rename to examples/platform-specific/zoul/node-red/mqtt-remote-demo.json
diff --git a/examples/platform-specific/zolertia/zoul/orion/README.md b/examples/platform-specific/zoul/orion/README.md
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/README.md
rename to examples/platform-specific/zoul/orion/README.md
diff --git a/examples/platform-specific/zolertia/zoul/orion/client/Makefile b/examples/platform-specific/zoul/orion/client/Makefile
similarity index 87%
rename from examples/platform-specific/zolertia/zoul/orion/client/Makefile
rename to examples/platform-specific/zoul/orion/client/Makefile
index fddf2eba6..413c7f916 100644
--- a/examples/platform-specific/zolertia/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zoul/orion/client/Makefile
@@ -8,5 +8,5 @@ APPS += http-socket
 
 WITH_IP64 = 1
 
-CONTIKI = ../../../../../..
+CONTIKI = ../../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/zolertia/zoul/orion/client/client.c b/examples/platform-specific/zoul/orion/client/client.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/client/client.c
rename to examples/platform-specific/zoul/orion/client/client.c
diff --git a/examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c b/examples/platform-specific/zoul/orion/client/ifttt-client.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/client/ifttt-client.c
rename to examples/platform-specific/zoul/orion/client/ifttt-client.c
diff --git a/examples/platform-specific/zolertia/zoul/orion/client/project-conf.h b/examples/platform-specific/zoul/orion/client/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/client/project-conf.h
rename to examples/platform-specific/zoul/orion/client/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile b/examples/platform-specific/zoul/orion/ip64-router/Makefile
similarity index 88%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
rename to examples/platform-specific/zoul/orion/ip64-router/Makefile
index 58ef9e74c..468376e66 100644
--- a/examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/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/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target b/examples/platform-specific/zoul/orion/ip64-router/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/Makefile.target
rename to examples/platform-specific/zoul/orion/ip64-router/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c b/examples/platform-specific/zoul/orion/ip64-router/httpd-simple.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.c
rename to examples/platform-specific/zoul/orion/ip64-router/httpd-simple.c
diff --git a/examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h b/examples/platform-specific/zoul/orion/ip64-router/httpd-simple.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/httpd-simple.h
rename to examples/platform-specific/zoul/orion/ip64-router/httpd-simple.h
diff --git a/examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c b/examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/ip64-router.c
rename to examples/platform-specific/zoul/orion/ip64-router/ip64-router.c
diff --git a/examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h b/examples/platform-specific/zoul/orion/ip64-router/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/orion/ip64-router/project-conf.h
rename to examples/platform-specific/zoul/orion/ip64-router/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/project-conf.h b/examples/platform-specific/zoul/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/project-conf.h
rename to examples/platform-specific/zoul/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/rev-a/Makefile b/examples/platform-specific/zoul/rev-a/Makefile
similarity index 86%
rename from examples/platform-specific/zolertia/zoul/rev-a/Makefile
rename to examples/platform-specific/zoul/rev-a/Makefile
index 4c18f17b9..bf3c06f74 100644
--- a/examples/platform-specific/zolertia/zoul/rev-a/Makefile
+++ b/examples/platform-specific/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/platform-specific/zolertia/zoul/rev-a/Makefile.target b/examples/platform-specific/zoul/rev-a/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-a/Makefile.target
rename to examples/platform-specific/zoul/rev-a/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/rev-a/project-conf.h b/examples/platform-specific/zoul/rev-a/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-a/project-conf.h
rename to examples/platform-specific/zoul/rev-a/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c b/examples/platform-specific/zoul/rev-a/test-power-mgmt.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-a/test-power-mgmt.c
rename to examples/platform-specific/zoul/rev-a/test-power-mgmt.c
diff --git a/examples/platform-specific/zolertia/zoul/rev-b/Makefile b/examples/platform-specific/zoul/rev-b/Makefile
similarity index 88%
rename from examples/platform-specific/zolertia/zoul/rev-b/Makefile
rename to examples/platform-specific/zoul/rev-b/Makefile
index 6c5e5834d..882591218 100644
--- a/examples/platform-specific/zolertia/zoul/rev-b/Makefile
+++ b/examples/platform-specific/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/platform-specific/zolertia/zoul/rev-b/Makefile.target b/examples/platform-specific/zoul/rev-b/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-b/Makefile.target
rename to examples/platform-specific/zoul/rev-b/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/rev-b/project-conf.h b/examples/platform-specific/zoul/rev-b/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-b/project-conf.h
rename to examples/platform-specific/zoul/rev-b/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c b/examples/platform-specific/zoul/rev-b/test-power-mgmt.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rev-b/test-power-mgmt.c
rename to examples/platform-specific/zoul/rev-b/test-power-mgmt.c
diff --git a/examples/platform-specific/zolertia/zoul/rtcc/Makefile b/examples/platform-specific/zoul/rtcc/Makefile
similarity index 85%
rename from examples/platform-specific/zolertia/zoul/rtcc/Makefile
rename to examples/platform-specific/zoul/rtcc/Makefile
index d0ddaaf1e..91b0aecf1 100644
--- a/examples/platform-specific/zolertia/zoul/rtcc/Makefile
+++ b/examples/platform-specific/zoul/rtcc/Makefile
@@ -5,5 +5,5 @@ TARGET = zoul
 
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../../..
+CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/zolertia/zoul/rtcc/Makefile.target b/examples/platform-specific/zoul/rtcc/Makefile.target
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rtcc/Makefile.target
rename to examples/platform-specific/zoul/rtcc/Makefile.target
diff --git a/examples/platform-specific/zolertia/zoul/rtcc/project-conf.h b/examples/platform-specific/zoul/rtcc/project-conf.h
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rtcc/project-conf.h
rename to examples/platform-specific/zoul/rtcc/project-conf.h
diff --git a/examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c b/examples/platform-specific/zoul/rtcc/test-rtcc.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/rtcc/test-rtcc.c
rename to examples/platform-specific/zoul/rtcc/test-rtcc.c
diff --git a/examples/platform-specific/zolertia/zoul/test-aac-sensor.c b/examples/platform-specific/zoul/test-aac-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-aac-sensor.c
rename to examples/platform-specific/zoul/test-aac-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-ac-dimmer.c b/examples/platform-specific/zoul/test-ac-dimmer.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-ac-dimmer.c
rename to examples/platform-specific/zoul/test-ac-dimmer.c
diff --git a/examples/platform-specific/zolertia/zoul/test-bme280.c b/examples/platform-specific/zoul/test-bme280.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-bme280.c
rename to examples/platform-specific/zoul/test-bme280.c
diff --git a/examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c b/examples/platform-specific/zoul/test-bmp085-bmp180.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-bmp085-bmp180.c
rename to examples/platform-specific/zoul/test-bmp085-bmp180.c
diff --git a/examples/platform-specific/zolertia/zoul/test-dht22.c b/examples/platform-specific/zoul/test-dht22.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-dht22.c
rename to examples/platform-specific/zoul/test-dht22.c
diff --git a/examples/platform-specific/zolertia/zoul/test-grove-gyro.c b/examples/platform-specific/zoul/test-grove-gyro.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-grove-gyro.c
rename to examples/platform-specific/zoul/test-grove-gyro.c
diff --git a/examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c b/examples/platform-specific/zoul/test-grove-light-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-grove-light-sensor.c
rename to examples/platform-specific/zoul/test-grove-light-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c b/examples/platform-specific/zoul/test-grove-loudness-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-grove-loudness-sensor.c
rename to examples/platform-specific/zoul/test-grove-loudness-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-iaq.c b/examples/platform-specific/zoul/test-iaq.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-iaq.c
rename to examples/platform-specific/zoul/test-iaq.c
diff --git a/examples/platform-specific/zolertia/zoul/test-lcd.c b/examples/platform-specific/zoul/test-lcd.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-lcd.c
rename to examples/platform-specific/zoul/test-lcd.c
diff --git a/examples/platform-specific/zolertia/zoul/test-motion.c b/examples/platform-specific/zoul/test-motion.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-motion.c
rename to examples/platform-specific/zoul/test-motion.c
diff --git a/examples/platform-specific/zolertia/zoul/test-pm10-sensor.c b/examples/platform-specific/zoul/test-pm10-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-pm10-sensor.c
rename to examples/platform-specific/zoul/test-pm10-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-relay.c b/examples/platform-specific/zoul/test-relay.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-relay.c
rename to examples/platform-specific/zoul/test-relay.c
diff --git a/examples/platform-specific/zolertia/zoul/test-rotation-sensor.c b/examples/platform-specific/zoul/test-rotation-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-rotation-sensor.c
rename to examples/platform-specific/zoul/test-rotation-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-servo.c b/examples/platform-specific/zoul/test-servo.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-servo.c
rename to examples/platform-specific/zoul/test-servo.c
diff --git a/examples/platform-specific/zolertia/zoul/test-sht25.c b/examples/platform-specific/zoul/test-sht25.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-sht25.c
rename to examples/platform-specific/zoul/test-sht25.c
diff --git a/examples/platform-specific/zolertia/zoul/test-tsl256x.c b/examples/platform-specific/zoul/test-tsl256x.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-tsl256x.c
rename to examples/platform-specific/zoul/test-tsl256x.c
diff --git a/examples/platform-specific/zolertia/zoul/test-vac-sensor.c b/examples/platform-specific/zoul/test-vac-sensor.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-vac-sensor.c
rename to examples/platform-specific/zoul/test-vac-sensor.c
diff --git a/examples/platform-specific/zolertia/zoul/test-weather-meter.c b/examples/platform-specific/zoul/test-weather-meter.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-weather-meter.c
rename to examples/platform-specific/zoul/test-weather-meter.c
diff --git a/examples/platform-specific/zolertia/zoul/test-zonik.c b/examples/platform-specific/zoul/test-zonik.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/test-zonik.c
rename to examples/platform-specific/zoul/test-zonik.c
diff --git a/examples/platform-specific/zolertia/zoul/zoul-demo.c b/examples/platform-specific/zoul/zoul-demo.c
similarity index 100%
rename from examples/platform-specific/zolertia/zoul/zoul-demo.c
rename to examples/platform-specific/zoul/zoul-demo.c
diff --git a/regression-tests/02-compile-arm-ports/Makefile b/regression-tests/02-compile-arm-ports/Makefile
index b8902da89..8dd206faa 100644
--- a/regression-tests/02-compile-arm-ports/Makefile
+++ b/regression-tests/02-compile-arm-ports/Makefile
@@ -26,7 +26,7 @@ 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 \
+platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
 ipv6/er-rest-example/zoul \
 ipso-objects/zoul \
 hello-world/zoul \