diff --git a/right/src/bridge_protocol_scheduler.c b/right/src/bridge_protocol_scheduler.c
index 84d5bfb..9480df1 100644
--- a/right/src/bridge_protocol_scheduler.c
+++ b/right/src/bridge_protocol_scheduler.c
@@ -3,16 +3,12 @@
 #include "slot.h"
 #include "main.h"
 #include "bridge_slaves/bridge_slave_led_driver.h"
+#include "bridge_slaves/bridge_slave_uhk_module.h"
 #include "i2c.h"
 #include "i2c_addresses.h"
 
 uint8_t currentBridgeSlaveId = 0;
 
-bool BridgeSlaveUhkModuleHandler(uint8_t uhkModuleId) {
-    I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
-    return true;
-}
-
 bridge_slave_t bridgeSlaves[] = {
     { .slaveHandler = BridgeSlaveUhkModuleHandler, .moduleId = 0 },
     { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 0 },
diff --git a/right/src/bridge_slaves/bridge_slave_uhk_module.c b/right/src/bridge_slaves/bridge_slave_uhk_module.c
new file mode 100644
index 0000000..0ad1d3b
--- /dev/null
+++ b/right/src/bridge_slaves/bridge_slave_uhk_module.c
@@ -0,0 +1,9 @@
+#include "i2c_addresses.h"
+#include "i2c.h"
+#include "bridge_slave_uhk_module.h"
+#include "main.h"
+
+bool BridgeSlaveUhkModuleHandler(uint8_t uhkModuleId) {
+    I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
+    return true;
+}
diff --git a/right/src/bridge_slaves/bridge_slave_uhk_module.h b/right/src/bridge_slaves/bridge_slave_uhk_module.h
new file mode 100644
index 0000000..3125ffe
--- /dev/null
+++ b/right/src/bridge_slaves/bridge_slave_uhk_module.h
@@ -0,0 +1,12 @@
+#ifndef __BRIDGE_SLAVE_UHK_MODULE_H__
+#define __BRIDGE_SLAVE_UHK_MODULE_H__
+
+// Includes:
+
+    #include "fsl_common.h"
+
+// Functions:
+
+    extern bool BridgeSlaveUhkModuleHandler(uint8_t uhkModuleId);
+
+#endif