diff --git a/firmware/framework/usb/inc/usb.h b/common_src/framework/usb/inc/usb.h
similarity index 100%
rename from firmware/framework/usb/inc/usb.h
rename to common_src/framework/usb/inc/usb.h
diff --git a/firmware/framework/usb/inc/usb_ch9.h b/common_src/framework/usb/inc/usb_ch9.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_ch9.h
rename to common_src/framework/usb/inc/usb_ch9.h
diff --git a/firmware/framework/usb/inc/usb_common.h b/common_src/framework/usb/inc/usb_common.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_common.h
rename to common_src/framework/usb/inc/usb_common.h
diff --git a/firmware/framework/usb/inc/usb_device.h b/common_src/framework/usb/inc/usb_device.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_device.h
rename to common_src/framework/usb/inc/usb_device.h
diff --git a/firmware/framework/usb/inc/usb_device_hid.h b/common_src/framework/usb/inc/usb_device_hid.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_device_hid.h
rename to common_src/framework/usb/inc/usb_device_hid.h
diff --git a/firmware/framework/usb/inc/usb_hal.h b/common_src/framework/usb/inc/usb_hal.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_hal.h
rename to common_src/framework/usb/inc/usb_hal.h
diff --git a/firmware/framework/usb/inc/usb_hal_pic18.h b/common_src/framework/usb/inc/usb_hal_pic18.h
similarity index 100%
rename from firmware/framework/usb/inc/usb_hal_pic18.h
rename to common_src/framework/usb/inc/usb_hal_pic18.h
diff --git a/firmware/framework/usb/src/usb_device.c b/common_src/framework/usb/src/usb_device.c
similarity index 100%
rename from firmware/framework/usb/src/usb_device.c
rename to common_src/framework/usb/src/usb_device.c
diff --git a/firmware/framework/usb/src/usb_device_hid.c b/common_src/framework/usb/src/usb_device_hid.c
similarity index 100%
rename from firmware/framework/usb/src/usb_device_hid.c
rename to common_src/framework/usb/src/usb_device_hid.c
diff --git a/firmware/framework/usb/src/usb_device_local.h b/common_src/framework/usb/src/usb_device_local.h
similarity index 100%
rename from firmware/framework/usb/src/usb_device_local.h
rename to common_src/framework/usb/src/usb_device_local.h
diff --git a/firmware/clubdance_v2.X/nbproject/configurations.xml b/firmware/clubdance_v2.X/nbproject/configurations.xml
index 3398c76..cfca5da 100644
--- a/firmware/clubdance_v2.X/nbproject/configurations.xml
+++ b/firmware/clubdance_v2.X/nbproject/configurations.xml
@@ -2,24 +2,24 @@
 <configurationDescriptor version="65">
   <logicalFolder name="root" displayName="root" projectFiles="true">
     <logicalFolder name="f1" displayName="common_src" projectFiles="true">
-      <itemPath>../../common_src/system.c</itemPath>
-    </logicalFolder>
-    <logicalFolder name="framework" displayName="framework" projectFiles="true">
-      <logicalFolder name="usb" displayName="usb" projectFiles="true">
-        <logicalFolder name="inc" displayName="inc" projectFiles="true">
-          <itemPath>../framework/usb/inc/usb.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_ch9.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_common.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_device.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_device_hid.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_hal.h</itemPath>
-          <itemPath>../framework/usb/inc/usb_hal_pic18.h</itemPath>
-        </logicalFolder>
-        <logicalFolder name="src" displayName="src" projectFiles="true">
-          <itemPath>../framework/usb/src/usb_device.c</itemPath>
-          <itemPath>../framework/usb/src/usb_device_hid.c</itemPath>
+      <logicalFolder name="framework" displayName="framework" projectFiles="true">
+        <logicalFolder name="usb" displayName="usb" projectFiles="true">
+          <logicalFolder name="inc" displayName="inc" projectFiles="true">
+            <itemPath>../../common_src/framework/usb/inc/usb.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_ch9.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_common.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_device.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_device_hid.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_hal.h</itemPath>
+            <itemPath>../../common_src/framework/usb/inc/usb_hal_pic18.h</itemPath>
+          </logicalFolder>
+          <logicalFolder name="src" displayName="src" projectFiles="true">
+            <itemPath>../../common_src/framework/usb/src/usb_device.c</itemPath>
+            <itemPath>../../common_src/framework/usb/src/usb_device_hid.c</itemPath>
+          </logicalFolder>
         </logicalFolder>
       </logicalFolder>
+      <itemPath>../../common_src/system.c</itemPath>
     </logicalFolder>
     <logicalFolder name="HeaderFiles"
                    displayName="Header Files"
@@ -100,7 +100,8 @@
         <property key="default-char-type" value="true"/>
         <property key="define-macros" value="LINK_FOR_BOOTLOADER"/>
         <property key="disable-optimizations" value="true"/>
-        <property key="extra-include-directories" value="..\framework\usb\inc;..\src"/>
+        <property key="extra-include-directories"
+                  value="..\src;..\..\common_src\framework\usb\inc"/>
         <property key="favor-optimization-for" value="-speed,+space"/>
         <property key="garbage-collect-data" value="true"/>
         <property key="garbage-collect-functions" value="true"/>
@@ -124,7 +125,7 @@
         <property key="use-iar" value="false"/>
         <property key="verbose" value="false"/>
         <property key="warning-level" value="-3"/>
-        <property key="what-to-do" value="ignore"/>
+        <property key="what-to-do" value="require"/>
       </HI-TECH-COMP>
       <HI-TECH-LINK>
         <property key="additional-options-checksum" value=""/>
@@ -273,7 +274,8 @@
         <property key="default-char-type" value="true"/>
         <property key="define-macros" value=""/>
         <property key="disable-optimizations" value="true"/>
-        <property key="extra-include-directories" value="..\framework\usb\inc;..\src"/>
+        <property key="extra-include-directories"
+                  value="..\src;..\..\common_src\framework\usb\inc"/>
         <property key="favor-optimization-for" value="-speed,+space"/>
         <property key="garbage-collect-data" value="true"/>
         <property key="garbage-collect-functions" value="true"/>
@@ -296,8 +298,8 @@
         <property key="use-cci" value="false"/>
         <property key="use-iar" value="false"/>
         <property key="verbose" value="false"/>
-        <property key="warning-level" value="-3"/>
-        <property key="what-to-do" value="ignore"/>
+        <property key="warning-level" value="0"/>
+        <property key="what-to-do" value="require"/>
       </HI-TECH-COMP>
       <HI-TECH-LINK>
         <property key="additional-options-checksum" value=""/>
diff --git a/firmware/src/main.c b/firmware/src/main.c
index 7fb17d4..d9e8566 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -22,6 +22,8 @@
  * @date 6 Aug 2019
  * @brief USB interface to 6-sensor DDR pads.
  */
+#pragma warning disable 1510
+
 #include "usb.h"
 #include "padhal.h"
 #include "dancepad.h"