diff --git a/firmware/src/system.c b/common_src/system.c
similarity index 100%
rename from firmware/src/system.c
rename to common_src/system.c
diff --git a/firmware/clubdance_v2.X/nbproject/configurations.xml b/firmware/clubdance_v2.X/nbproject/configurations.xml
index 58eafad..30bd985 100644
--- a/firmware/clubdance_v2.X/nbproject/configurations.xml
+++ b/firmware/clubdance_v2.X/nbproject/configurations.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
@@ -33,7 +36,6 @@
                    displayName="Source Files"
                    projectFiles="true">
       <itemPath>../src/main.c</itemPath>
-      <itemPath>../src/system.c</itemPath>
       <itemPath>../src/usb_descriptors.c</itemPath>
       <itemPath>../src/usb_events.c</itemPath>
       <itemPath>../src/interrupts.c</itemPath>
@@ -49,6 +51,7 @@
   <sourceRootList>
     <Elem>../src</Elem>
     <Elem>../framework</Elem>
+    <Elem>../../common_src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
diff --git a/firmware/clubdance_v2.X/nbproject/project.xml b/firmware/clubdance_v2.X/nbproject/project.xml
index 1a429cd..ea3aed9 100644
--- a/firmware/clubdance_v2.X/nbproject/project.xml
+++ b/firmware/clubdance_v2.X/nbproject/project.xml
@@ -15,6 +15,7 @@
             <sourceRootList>
                 <sourceRootElem>../src</sourceRootElem>
                 <sourceRootElem>../framework</sourceRootElem>
+                <sourceRootElem>../../common_src</sourceRootElem>
             </sourceRootList>
             <confList>
                 <confElem>