diff --git a/common/keymap.h b/common/keymap.h
index 09cb192..41904a7 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-#include "achordion.h"
+#include "features/achordion.h"
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
   if (!process_achordion(keycode, record)) { return false; }
diff --git a/common/achordion.c b/features/achordion.c
similarity index 100%
rename from common/achordion.c
rename to features/achordion.c
diff --git a/common/achordion.h b/features/achordion.h
similarity index 100%
rename from common/achordion.h
rename to features/achordion.h
diff --git a/rules.mk b/rules.mk
index 5567d2f..4ed277c 100644
--- a/rules.mk
+++ b/rules.mk
@@ -11,7 +11,7 @@ MUSIC_ENABLE = no
 SPACE_CADET_ENABLE = no
 
 # add achordion to improve home row modifiers
-SRC += common/achordion.c
+SRC += features/achordion.c
 
 # good optimizations
 LTO_ENABLE = yes