diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4a6172e5..6de97d39 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -30,15 +30,7 @@ target_sources(app PRIVATE src/hid.c)
 target_sources(app PRIVATE src/sensors.c)
 target_sources(app PRIVATE src/event_manager.c)
 target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/ext_power_generic.c)
-target_sources(app PRIVATE src/events/activity_state_changed.c)
-target_sources(app PRIVATE src/events/position_state_changed.c)
-target_sources(app PRIVATE src/events/layer_state_changed.c)
-target_sources(app PRIVATE src/events/keycode_state_changed.c)
-target_sources(app PRIVATE src/events/modifiers_state_changed.c)
-target_sources(app PRIVATE src/events/sensor_event.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
-target_sources_ifdef(CONFIG_USB app PRIVATE src/events/usb_conn_state_changed.c)
+add_subdirectory(src/events)
 add_subdirectory(src/behaviors)
 if (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL)
   target_sources(app PRIVATE src/keymap.c)
diff --git a/app/src/events/CMakeLists.txt b/app/src/events/CMakeLists.txt
new file mode 100644
index 00000000..4170b0f8
--- /dev/null
+++ b/app/src/events/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+target_sources(app PRIVATE activity_state_changed.c)
+target_sources(app PRIVATE position_state_changed.c)
+target_sources(app PRIVATE layer_state_changed.c)
+target_sources(app PRIVATE keycode_state_changed.c)
+target_sources(app PRIVATE modifiers_state_changed.c)
+target_sources(app PRIVATE sensor_event.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE ble_active_profile_changed.c)
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE battery_state_changed.c)
+target_sources_ifdef(CONFIG_USB app PRIVATE usb_conn_state_changed.c)
\ No newline at end of file