diff --git a/Arduino/platformio.ini b/Arduino/platformio.ini
index 5f29140..0c4a489 100644
--- a/Arduino/platformio.ini
+++ b/Arduino/platformio.ini
@@ -38,14 +38,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=ARDUINO
 lib_deps = 
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 
 
diff --git a/ESP32-DevKit/platformio.ini b/ESP32-DevKit/platformio.ini
index dc365a7..105274d 100644
--- a/ESP32-DevKit/platformio.ini
+++ b/ESP32-DevKit/platformio.ini
@@ -25,14 +25,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=ARDUINO
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 
 [env:esp32dev]
diff --git a/NUCLEO-F072RB/platformio.ini b/NUCLEO-F072RB/platformio.ini
index 73dfefe..d39c6f4 100644
--- a/NUCLEO-F072RB/platformio.ini
+++ b/NUCLEO-F072RB/platformio.ini
@@ -28,14 +28,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=NUCLEO-F0
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 debug_tool = stlink
 upload_protocol = stlink
diff --git a/NUCLEO-F401RE/platformio.ini b/NUCLEO-F401RE/platformio.ini
index 73c3197..7369cae 100644
--- a/NUCLEO-F401RE/platformio.ini
+++ b/NUCLEO-F401RE/platformio.ini
@@ -28,14 +28,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=NUCLEO-F4
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 debug_tool = stlink
 upload_protocol = stlink
diff --git a/NUCLEO-F410RB/platformio.ini b/NUCLEO-F410RB/platformio.ini
index d891420..6cbdece 100644
--- a/NUCLEO-F410RB/platformio.ini
+++ b/NUCLEO-F410RB/platformio.ini
@@ -28,14 +28,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=NUCLEO-F4
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 debug_tool = stlink
 upload_protocol = stlink
diff --git a/NUCLEO-G431KB/platformio.ini b/NUCLEO-G431KB/platformio.ini
index f6f5dbe..960ebdc 100644
--- a/NUCLEO-G431KB/platformio.ini
+++ b/NUCLEO-G431KB/platformio.ini
@@ -28,12 +28,12 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=NUCLEO-G431
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
diff --git a/NUCLEO-L432KC/platformio.ini b/NUCLEO-L432KC/platformio.ini
index 456d824..43b8bc6 100644
--- a/NUCLEO-L432KC/platformio.ini
+++ b/NUCLEO-L432KC/platformio.ini
@@ -28,14 +28,14 @@ build_flags =
     -D PIPEMODE=SERIAL
     -D PIPEHAL=NUCLEO-L4
 lib_deps =
-    luos_engine@^3.0.0
-    robus_network
+    luos/luos_engine@^3.0.0
+    luos/robus_network
     Led
     Blinker_App
-    Pipe
-    Gate
+    luos/Pipe
+    luos/Gate
 lib_extra_dirs =
-    $PROJECT_DIR/../Apps
+    ../Apps
     lib
 debug_tool = stlink
 upload_protocol = stlink
diff --git a/No-Board/platformio.ini b/No-Board/platformio.ini
index cc4eed2..9f048cf 100644
--- a/No-Board/platformio.ini
+++ b/No-Board/platformio.ini
@@ -31,15 +31,13 @@ build_flags =
     -D PIPEHAL=native
 
 lib_deps =
-    luos_engine@^3.0.0
+    luos/luos_engine@^3.0.0
     Led
     Blinker_App
-    Pipe
-    Gate
-    robus_network
+    luos/Pipe
+    luos/Gate
+    luos/robus_network
 
 lib_extra_dirs =
-    $PROJECT_DIR/../../
-    $PROJECT_DIR/../../luos_engine/tool_services
     ../Apps
     lib