diff --git a/.cproject b/.cproject
index cf2f299..208155d 100644
--- a/.cproject
+++ b/.cproject
@@ -146,13 +146,12 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libzaf"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="zaf_protocol"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="LWIP"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libzaf"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -279,13 +278,12 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libzaf"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="zaf_protocol"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="LWIP"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libzaf"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/usrc/project_dep.h b/usrc/project_dep.h
index ecf4aaf..3ad152f 100644
--- a/usrc/project_dep.h
+++ b/usrc/project_dep.h
@@ -9,7 +9,7 @@
 #include "lwip/sys.h"
 
 #include "libzaf\zaf.h"
-#include "zaf_protocol\zaf_protocol.h"
+#include "zfpga_basic_protocol\zaf_protocol.h"
 
 #include "main.h"
 #include "spi.h"
diff --git a/usrc/service/reg_manager.c b/usrc/service/reg_manager.c
index 33e9cee..082f421 100644
--- a/usrc/service/reg_manager.c
+++ b/usrc/service/reg_manager.c
@@ -3,7 +3,6 @@
 #include "base_service/config_service.h"
 #include "base_service/fpga_if.h"
 #include "device_info.hpp"
-#include "zaf_protocol/zaf_regs.hpp"
 
 uint32_t m_action_val0;
 uint32_t m_action_receipt;
diff --git a/zfpga_basic_protocol b/zfpga_basic_protocol
index a9a017d..eb14cf9 160000
--- a/zfpga_basic_protocol
+++ b/zfpga_basic_protocol
@@ -1 +1 @@
-Subproject commit a9a017d6c9d70c459944f8a4b658b8f71568f23c
+Subproject commit eb14cf988689954200e3a083b9b0d7b52260f4d7