diff --git a/cpu/msp430/cc2520-arch-sfd.c b/cpu/msp430/cc2520-arch-sfd.c
index ff47a48c8..5eb35cedb 100644
--- a/cpu/msp430/cc2520-arch-sfd.c
+++ b/cpu/msp430/cc2520-arch-sfd.c
@@ -29,7 +29,7 @@
 
 #include "contiki.h"
 #include "dev/spi.h"
-#include "dev/cc2520.h"
+#include "dev/cc2520/cc2520.h"
 #include "isr_compat.h"
 
 extern volatile uint8_t cc2520_sfd_counter;
diff --git a/cpu/msp430/cc2520-arch.c b/cpu/msp430/cc2520-arch.c
index e8792b86a..d57e7571a 100644
--- a/cpu/msp430/cc2520-arch.c
+++ b/cpu/msp430/cc2520-arch.c
@@ -31,7 +31,7 @@
 #include "contiki-net.h"
 
 #include "dev/spi.h"
-#include "dev/cc2520.h"
+#include "dev/cc2520/cc2520.h"
 #include "isr_compat.h"
 
 #ifdef CC2520_CONF_SFD_TIMESTAMPS
diff --git a/core/dev/cc2520.c b/dev/cc2520/cc2520.c
similarity index 99%
rename from core/dev/cc2520.c
rename to dev/cc2520/cc2520.c
index cd0db14d6..561236b08 100644
--- a/core/dev/cc2520.c
+++ b/dev/cc2520/cc2520.c
@@ -35,8 +35,8 @@
 #include "contiki.h"
 
 #include "dev/spi.h"
-#include "dev/cc2520.h"
-#include "dev/cc2520_const.h"
+#include "dev/cc2520/cc2520.h"
+#include "dev/cc2520/cc2520_const.h"
 
 #include "net/packetbuf.h"
 #include "net/rime/rimestats.h"
diff --git a/core/dev/cc2520.h b/dev/cc2520/cc2520.h
similarity index 99%
rename from core/dev/cc2520.h
rename to dev/cc2520/cc2520.h
index 032b32b8d..18a43649a 100644
--- a/core/dev/cc2520.h
+++ b/dev/cc2520/cc2520.h
@@ -43,7 +43,7 @@
 #include "contiki.h"
 #include "dev/spi.h"
 #include "dev/radio.h"
-#include "dev/cc2520_const.h"
+#include "dev/cc2520/cc2520_const.h"
 
 int cc2520_init(void);
 
diff --git a/core/dev/cc2520_const.h b/dev/cc2520/cc2520_const.h
similarity index 100%
rename from core/dev/cc2520_const.h
rename to dev/cc2520/cc2520_const.h
diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c
index 4775405d6..fe4ea65ba 100644
--- a/platform/wismote/contiki-wismote-main.c
+++ b/platform/wismote/contiki-wismote-main.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dev/cc2520.h"
+#include "dev/cc2520/cc2520.h"
 //#include "dev/ds2411.h"
 #include "dev/leds.h"
 #include "dev/serial-line.h"
diff --git a/platform/wismote/dev/radio-sensor.c b/platform/wismote/dev/radio-sensor.c
index 4e0e48ce3..0288e26d2 100644
--- a/platform/wismote/dev/radio-sensor.c
+++ b/platform/wismote/dev/radio-sensor.c
@@ -31,7 +31,7 @@
  */
 
 #include "lib/sensors.h"
-#include "dev/cc2520.h"
+#include "dev/cc2520/cc2520.h"
 #include "dev/radio-sensor.h"
 
 const struct sensors_sensor radio_sensor;