diff --git a/306-controller_interface.X/mcc_generated_files/device_config.c b/306-controller_interface.X/mcc_generated_files/device_config.c
index 1e3bf51..eb96dd3 100644
--- a/306-controller_interface.X/mcc_generated_files/device_config.c
+++ b/306-controller_interface.X/mcc_generated_files/device_config.c
@@ -14,7 +14,7 @@
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.00
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/device_config.h b/306-controller_interface.X/mcc_generated_files/device_config.h
index 72f9a53..0c48b82 100644
--- a/306-controller_interface.X/mcc_generated_files/device_config.h
+++ b/306-controller_interface.X/mcc_generated_files/device_config.h
@@ -14,7 +14,7 @@
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.00
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/ecan.c b/306-controller_interface.X/mcc_generated_files/ecan.c
index 5c28c48..1f2e918 100644
--- a/306-controller_interface.X/mcc_generated_files/ecan.c
+++ b/306-controller_interface.X/mcc_generated_files/ecan.c
@@ -13,12 +13,12 @@
   @Description
     This source file provides APIs for CAN.
     Generation Information :
-        Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.7
-        Device            :  PIC18F26K83
+        Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
+        Device            :  PIC18F25K83
         Driver Version    :  3.0.0
     The generated drivers are tested against the following:
-        Compiler          :  XC8 2.31 and above
-        MPLAB 	          :  MPLAB X 5.45
+        Compiler          :  XC8 2.36 and above
+        MPLAB 	          :  MPLAB X 6.00
 */
 
 /*
diff --git a/306-controller_interface.X/mcc_generated_files/interrupt_manager.c b/306-controller_interface.X/mcc_generated_files/interrupt_manager.c
index db7e86a..bd0b551 100644
--- a/306-controller_interface.X/mcc_generated_files/interrupt_manager.c
+++ b/306-controller_interface.X/mcc_generated_files/interrupt_manager.c
@@ -16,7 +16,7 @@
     all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.04
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/interrupt_manager.h b/306-controller_interface.X/mcc_generated_files/interrupt_manager.h
index babb6f2..90330f6 100644
--- a/306-controller_interface.X/mcc_generated_files/interrupt_manager.h
+++ b/306-controller_interface.X/mcc_generated_files/interrupt_manager.h
@@ -16,7 +16,7 @@
     all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.03
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/mcc.c b/306-controller_interface.X/mcc_generated_files/mcc.c
index e2cbde5..0abd635 100644
--- a/306-controller_interface.X/mcc_generated_files/mcc.c
+++ b/306-controller_interface.X/mcc_generated_files/mcc.c
@@ -14,7 +14,7 @@
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.00
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/mcc.h b/306-controller_interface.X/mcc_generated_files/mcc.h
index f681b38..6360c59 100644
--- a/306-controller_interface.X/mcc_generated_files/mcc.h
+++ b/306-controller_interface.X/mcc_generated_files/mcc.h
@@ -14,7 +14,7 @@
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.00
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above or later
diff --git a/306-controller_interface.X/mcc_generated_files/memory.c b/306-controller_interface.X/mcc_generated_files/memory.c
index b53aa2c..3bf3c4c 100644
--- a/306-controller_interface.X/mcc_generated_files/memory.c
+++ b/306-controller_interface.X/mcc_generated_files/memory.c
@@ -14,7 +14,7 @@
     This file provides implementations of driver APIs for MEMORY.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.1.3
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
diff --git a/306-controller_interface.X/mcc_generated_files/memory.h b/306-controller_interface.X/mcc_generated_files/memory.h
index 5020390..e295cca 100644
--- a/306-controller_interface.X/mcc_generated_files/memory.h
+++ b/306-controller_interface.X/mcc_generated_files/memory.h
@@ -14,7 +14,7 @@
     This header file provides APIs for driver for MEMORY.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.1.3
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
@@ -64,9 +64,9 @@
   Section: Macro Declarations
 */
 
-#define WRITE_FLASH_BLOCKSIZE    128
-#define ERASE_FLASH_BLOCKSIZE    128
-#define END_FLASH                0x010000
+#define WRITE_FLASH_BLOCKSIZE    64
+#define ERASE_FLASH_BLOCKSIZE    64
+#define END_FLASH                0x008000
 
 /**
   Section: Flash Module APIs
diff --git a/306-controller_interface.X/mcc_generated_files/pin_manager.c b/306-controller_interface.X/mcc_generated_files/pin_manager.c
index b9c898e..adf9b9a 100644
--- a/306-controller_interface.X/mcc_generated_files/pin_manager.c
+++ b/306-controller_interface.X/mcc_generated_files/pin_manager.c
@@ -14,7 +14,7 @@
     This header file provides implementations for pin APIs for all pins selected in the GUI.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.11
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
diff --git a/306-controller_interface.X/mcc_generated_files/pin_manager.h b/306-controller_interface.X/mcc_generated_files/pin_manager.h
index a4d0d24..791e977 100644
--- a/306-controller_interface.X/mcc_generated_files/pin_manager.h
+++ b/306-controller_interface.X/mcc_generated_files/pin_manager.h
@@ -14,7 +14,7 @@
     This header file provides APIs for driver for .
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  2.11
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
diff --git a/306-controller_interface.X/mcc_generated_files/tmr0.c b/306-controller_interface.X/mcc_generated_files/tmr0.c
index 72ae03d..5e32ee5 100644
--- a/306-controller_interface.X/mcc_generated_files/tmr0.c
+++ b/306-controller_interface.X/mcc_generated_files/tmr0.c
@@ -14,7 +14,7 @@
     This source file provides APIs for TMR0.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  3.10
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
diff --git a/306-controller_interface.X/mcc_generated_files/tmr0.h b/306-controller_interface.X/mcc_generated_files/tmr0.h
index 60b06d7..ad9154b 100644
--- a/306-controller_interface.X/mcc_generated_files/tmr0.h
+++ b/306-controller_interface.X/mcc_generated_files/tmr0.h
@@ -14,7 +14,7 @@
     This header file provides APIs for TMR0.
     Generation Information :
         Product Revision  :  PIC10 / PIC12 / PIC16 / PIC18 MCUs - 1.81.8
-        Device            :  PIC18F26K83
+        Device            :  PIC18F25K83
         Driver Version    :  3.10
     The generated drivers are tested against the following:
         Compiler          :  XC8 2.36 and above
diff --git a/306-controller_interface.X/nbproject/configurations.xml b/306-controller_interface.X/nbproject/configurations.xml
index f742c6a..1a5d8bc 100644
--- a/306-controller_interface.X/nbproject/configurations.xml
+++ b/306-controller_interface.X/nbproject/configurations.xml
@@ -41,7 +41,6 @@
                    projectFiles="true">
       <logicalFolder name="app" displayName="app" projectFiles="true">
         <itemPath>app/factory/factory.c</itemPath>
-        <itemPath>app/main.c</itemPath>
       </logicalFolder>
       <logicalFolder name="board" displayName="board" projectFiles="true">
         <itemPath>board/led/led.c</itemPath>
@@ -65,6 +64,7 @@
         <itemPath>xf/event.c</itemPath>
         <itemPath>xf/xf.c</itemPath>
       </logicalFolder>
+      <itemPath>main.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -75,19 +75,14 @@
     </logicalFolder>
   </logicalFolder>
   <sourceRootList>
-    <Elem>board</Elem>
-    <Elem>led</Elem>
-    <Elem>factory</Elem>
-    <Elem>middleware</Elem>
-    <Elem>app</Elem>
-    <Elem>xf</Elem>
+    <Elem>.</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
     <conf name="default" type="2">
       <toolsSet>
         <developmentServer>localhost</developmentServer>
-        <targetDevice>PIC18F26K83</targetDevice>
+        <targetDevice>PIC18F25K83</targetDevice>
         <targetHeader></targetHeader>
         <targetPluginBoard></targetPluginBoard>
         <platformTool>PICkit3PlatformTool</platformTool>
@@ -245,7 +240,7 @@
         <property key="programoptions.programcalmem" value="false"/>
         <property key="programoptions.programuserotp" value="false"/>
         <property key="programoptions.testmodeentrymethod" value="VDDFirst"/>
-        <property key="programoptions.usehighvoltageonmclr" value="false"/>
+        <property key="programoptions.usehighvoltageonmclr" value="true"/>
         <property key="programoptions.uselvpprogramming" value="false"/>
         <property key="voltagevalue" value="5.0"/>
       </PICkit3PlatformTool>
@@ -290,7 +285,7 @@
         <property key="programoptions.programcalmem" value="false"/>
         <property key="programoptions.programuserotp" value="false"/>
         <property key="programoptions.testmodeentrymethod" value="VDDFirst"/>
-        <property key="programoptions.usehighvoltageonmclr" value="false"/>
+        <property key="programoptions.usehighvoltageonmclr" value="true"/>
         <property key="programoptions.uselvpprogramming" value="false"/>
         <property key="voltagevalue" value="5.0"/>
       </Tool>
diff --git a/306-controller_interface.X/nbproject/project.xml b/306-controller_interface.X/nbproject/project.xml
index 042e146..900e579 100644
--- a/306-controller_interface.X/nbproject/project.xml
+++ b/306-controller_interface.X/nbproject/project.xml
@@ -13,12 +13,7 @@
             <sourceEncoding>ISO-8859-1</sourceEncoding>
             <make-dep-projects/>
             <sourceRootList>
-                <sourceRootElem>board</sourceRootElem>
-                <sourceRootElem>led</sourceRootElem>
-                <sourceRootElem>factory</sourceRootElem>
-                <sourceRootElem>middleware</sourceRootElem>
-                <sourceRootElem>app</sourceRootElem>
-                <sourceRootElem>xf</sourceRootElem>
+                <sourceRootElem>.</sourceRootElem>
             </sourceRootList>
             <confList>
                 <confElem>