diff --git a/chaos_micro_unit_toolkit/CMakeLists.txt b/chaos_micro_unit_toolkit/CMakeLists.txt
index 273e796826e748e9f49d5f3543b24db511c76871..b154eea02224a66f239a6463e94897c17c6d5f0a 100644
--- a/chaos_micro_unit_toolkit/CMakeLists.txt
+++ b/chaos_micro_unit_toolkit/CMakeLists.txt
@@ -14,26 +14,26 @@ SET(source ${source} connection/unit_proxy/AbstractUnitProxy.cpp
 SET(source ${source} connection/unit_proxy/raw_driver/RawDriverUnitProxy.cpp
                      connection/unit_proxy/raw_driver/RawDriverHandlerWrapper.cpp)
 SET(source ${source}
-                    external_lib/bson/bcon.c
-                    external_lib/bson/bson-atomic.c
-                    external_lib/bson/bson-clock.c
-                    external_lib/bson/bson-context.c
-                    external_lib/bson/bson-decimal128.c
-                    external_lib/bson/bson-error.c
-                    external_lib/bson/bson-iso8601.c
-                    external_lib/bson/bson-iter.c
-                    external_lib/bson/bson-json.c
-                    external_lib/bson/bson-keys.c
-                    external_lib/bson/bson-md5.c
-                    external_lib/bson/bson-memory.c
-                    external_lib/bson/bson-oid.c
-                    external_lib/bson/bson-reader.c
-                    external_lib/bson/bson-string.c
-                    external_lib/bson/bson-timegm.c
-                    external_lib/bson/bson-utf8.c
-                    external_lib/bson/bson-value.c
-                    external_lib/bson/bson-writer.c
-                    external_lib/bson/bson.c
+                    external_lib/bson/bson/bson.c
+                    external_lib/bson/bson/bson-atomic.c
+                    external_lib/bson/bson/bson-clock.c
+                    external_lib/bson/bson/bson-context.c
+                    external_lib/bson/bson/bson-decimal128.c
+                    external_lib/bson/bson/bson-error.c
+                    external_lib/bson/bson/bson-iso8601.c
+                    external_lib/bson/bson/bson-iter.c
+                    external_lib/bson/bson/bson-json.c
+                    external_lib/bson/bson/bson-keys.c
+                    external_lib/bson/bson/bson-md5.c
+                    external_lib/bson/bson/bson-memory.c
+                    external_lib/bson/bson/bson-oid.c
+                    external_lib/bson/bson/bson-reader.c
+                    external_lib/bson/bson/bson-string.c
+                    external_lib/bson/bson/bson-timegm.c
+                    external_lib/bson/bson/bson-utf8.c
+                    external_lib/bson/bson/bson-value.c
+                    external_lib/bson/bson/bson-writer.c
+                    external_lib/bson/bson/bson.c
                     external_lib/jsonsl/jsonsl.c)
 SET(source ${source} external_lib/mongoose.c
                      external_lib/base64.cpp)
diff --git a/chaos_micro_unit_toolkit/external_lib/bson/jsonsl/jsonsl.c b/chaos_micro_unit_toolkit/external_lib/jsonsl/jsonsl.c
similarity index 99%
rename from chaos_micro_unit_toolkit/external_lib/bson/jsonsl/jsonsl.c
rename to chaos_micro_unit_toolkit/external_lib/jsonsl/jsonsl.c
index 642a904a8d807562dfd65c5f85d4ec523388e051..2005a32b9a74d48198b15550a132bbafcfa69315 100644
--- a/chaos_micro_unit_toolkit/external_lib/bson/jsonsl/jsonsl.c
+++ b/chaos_micro_unit_toolkit/external_lib/jsonsl/jsonsl.c
@@ -4,7 +4,7 @@
  */
 
 #include "jsonsl.h"
-#include "../bson/bson-memory.h"
+#include "../bson/bson/bson-memory.h"
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/chaos_micro_unit_toolkit/external_lib/bson/jsonsl/jsonsl.h b/chaos_micro_unit_toolkit/external_lib/jsonsl/jsonsl.h
similarity index 100%
rename from chaos_micro_unit_toolkit/external_lib/bson/jsonsl/jsonsl.h
rename to chaos_micro_unit_toolkit/external_lib/jsonsl/jsonsl.h