diff --git a/.gitmodules b/.gitmodules
index 805ffbb..13d42b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "build/libs/SimCore/libs/whisper-comm"]
 	path = build/libs/SimCore/libs/whisper-comm
 	url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/whisper-com.git
-[submodule "libs/OrderLibrary"]
-	path = libs/OrderLibrary
-	url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/OrderLibrary.git
 [submodule "libs/ixwebsocket"]
 	path = libs/ixwebsocket
 	url = https://github.com/machinezone/IXWebSocket.git
@@ -16,3 +13,6 @@
 [submodule "libs/easywsclient"]
 	path = libs/easywsclient
 	url = https://github.com/dhbaird/easywsclient.git
+[submodule "libs/OrderLibrary"]
+	path = libs/OrderLibrary
+	url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/OrderLibrary.git
diff --git a/cmake/Modules/protobuf.cmake b/cmake/Modules/protobuf.cmake
index 5345033..4c1fa1f 100644
--- a/cmake/Modules/protobuf.cmake
+++ b/cmake/Modules/protobuf.cmake
@@ -15,7 +15,7 @@ function(protobuf_generate_cpp)
                         ${ARGN})
 
     FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto)
-    set(PROTOC ${CMAKE_BINARY_DIR}/libs/OrderLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/protoc)
+    set(PROTOC ${CMAKE_BINARY_DIR}/libs/OrderLibrary/libs/SimCore/libs/SimCom/libs/protobuf/protoc)
     message(STATUS "protoc path: " ${PROTOC})
 
    FOREACH(proto ${PROTO_FILES})
@@ -28,7 +28,7 @@ function(protobuf_generate_cpp)
      add_custom_command(
          OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc"
          DEPENDS "${protoDIR}/${protoFILENAME}.proto"
-         COMMAND ${PROTOC}  --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/include/SimCore/Messages/Protos"  --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto"
+         COMMAND ${PROTOC}  --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/include/SimCore/Messages/Protos"  --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/libs/SimCom/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto"
         
          )
     
diff --git a/libs/OrderLibrary b/libs/OrderLibrary
index 13f3c07..107fccc 160000
--- a/libs/OrderLibrary
+++ b/libs/OrderLibrary
@@ -1 +1 @@
-Subproject commit 13f3c07dbc436f2b21e0fb7ab156f1808efdffa6
+Subproject commit 107fcccbf6afab00c6f69519e740f03e70a2e4f9