diff --git a/core/net/mac/cxmac/Makefile.core-net-mac-cxmac b/core/net/mac/cxmac/Makefile.core-net-mac-cxmac
new file mode 100644
index 000000000..11088c451
--- /dev/null
+++ b/core/net/mac/cxmac/Makefile.core-net-mac-cxmac
@@ -0,0 +1 @@
+core-net-mac-cxmac_src = cxmac.c
diff --git a/core/net/mac/cxmac.c b/core/net/mac/cxmac/cxmac.c
similarity index 99%
rename from core/net/mac/cxmac.c
rename to core/net/mac/cxmac/cxmac.c
index 1c7bbaf9a..151604604 100644
--- a/core/net/mac/cxmac.c
+++ b/core/net/mac/cxmac/cxmac.c
@@ -44,7 +44,7 @@
 #include "dev/watchdog.h"
 #include "net/netstack.h"
 #include "lib/random.h"
-#include "net/mac/cxmac.h"
+#include "net/mac/cxmac/cxmac.h"
 #include "net/rime.h"
 #include "net/rime/timesynch.h"
 #include "sys/compower.h"
diff --git a/core/net/mac/cxmac.h b/core/net/mac/cxmac/cxmac.h
similarity index 100%
rename from core/net/mac/cxmac.h
rename to core/net/mac/cxmac/cxmac.h