diff --git a/right/build/armgcc/CMakeLists.txt b/right/build/armgcc/CMakeLists.txt
index ade9d33..c69115b 100644
--- a/right/build/armgcc/CMakeLists.txt
+++ b/right/build/armgcc/CMakeLists.txt
@@ -167,23 +167,28 @@ add_executable(dev_composite_hid_mouse_hid_keyboard_bm.elf
 "${SrcDir}/include/usb/usb_device_hid.h"
 "${SrcDir}/include/usb/usb_device_ch9.c"
 "${SrcDir}/include/usb/usb_device_ch9.h"
-"${SrcDir}/composite.c"
-"${SrcDir}/composite.h"
-"${SrcDir}/hid_generic.c"
-"${SrcDir}/hid_generic.h"
-"${SrcDir}/hid_keyboard.c"
-"${SrcDir}/hid_keyboard.h"
-"${SrcDir}/hid_mouse.c"
-"${SrcDir}/hid_mouse.h"
-"${SrcDir}/usb_device_descriptor.c"
-"${SrcDir}/usb_device_descriptor.h"
+"${SrcDir}/main.c"
+"${SrcDir}/usb_composite_device.c"
+"${SrcDir}/usb_composite_device.h"
+"${SrcDir}/usb_descriptor_configuration.c"
+"${SrcDir}/usb_descriptor_configuration.h"
+"${SrcDir}/usb_descriptor_device.c"
+"${SrcDir}/usb_descriptor_device.h"
+"${SrcDir}/usb_descriptor_generic_hid_report.c"
+"${SrcDir}/usb_descriptor_generic_hid_report.h"
+"${SrcDir}/usb_descriptor_keyboard_report.c"
+"${SrcDir}/usb_descriptor_keyboard_report.h"
+"${SrcDir}/usb_descriptor_mouse_report.c"
+"${SrcDir}/usb_descriptor_mouse_report.h"
+"${SrcDir}/usb_descriptor_strings.c"
+"${SrcDir}/usb_descriptor_strings.h"
 "${SrcDir}/usb_device_config.h"
-"${SrcDir}/usb_generic_hid_descriptors.c"
-"${SrcDir}/usb_generic_hid_descriptors.h"
-"${SrcDir}/usb_keyboard_descriptors.c"
-"${SrcDir}/usb_keyboard_descriptors.h"
-"${SrcDir}/usb_mouse_descriptors.c"
-"${SrcDir}/usb_mouse_descriptors.h"
+"${SrcDir}/usb_interface_generic_hid.c"
+"${SrcDir}/usb_interface_generic_hid.h"
+"${SrcDir}/usb_interface_keyboard.c"
+"${SrcDir}/usb_interface_keyboard.h"
+"${SrcDir}/usb_interface_mouse.c"
+"${SrcDir}/usb_interface_mouse.h"
 "${KsdkDir}/devices/MK22F51212/system_MK22F51212.c"
 "${KsdkDir}/devices/MK22F51212/system_MK22F51212.h"
 "${KsdkDir}/devices/MK22F51212/utilities/fsl_debug_console.c"