diff --git a/client/engine/Boot.lib b/client/lib/engine/bin/Boot.lib
similarity index 100%
rename from client/engine/Boot.lib
rename to client/lib/engine/bin/Boot.lib
diff --git a/client/engine/Cache.lib b/client/lib/engine/bin/Cache.lib
similarity index 100%
rename from client/engine/Cache.lib
rename to client/lib/engine/bin/Cache.lib
diff --git a/client/engine/Disk.lib b/client/lib/engine/bin/Disk.lib
similarity index 100%
rename from client/engine/Disk.lib
rename to client/lib/engine/bin/Disk.lib
diff --git a/client/engine/File.lib b/client/lib/engine/bin/File.lib
similarity index 100%
rename from client/engine/File.lib
rename to client/lib/engine/bin/File.lib
diff --git a/client/engine/FileSystem.lib b/client/lib/engine/bin/FileSystem.lib
similarity index 100%
rename from client/engine/FileSystem.lib
rename to client/lib/engine/bin/FileSystem.lib
diff --git a/client/engine/Image.lib b/client/lib/engine/bin/Image.lib
similarity index 100%
rename from client/engine/Image.lib
rename to client/lib/engine/bin/Image.lib
diff --git a/client/engine/Inventory.lib b/client/lib/engine/bin/Inventory.lib
similarity index 100%
rename from client/engine/Inventory.lib
rename to client/lib/engine/bin/Inventory.lib
diff --git a/client/engine/Net.lib b/client/lib/engine/bin/Net.lib
similarity index 100%
rename from client/engine/Net.lib
rename to client/lib/engine/bin/Net.lib
diff --git a/client/engine/PostConf.lib b/client/lib/engine/bin/PostConf.lib
similarity index 100%
rename from client/engine/PostConf.lib
rename to client/lib/engine/bin/PostConf.lib
diff --git a/client/engine/PostConfEAC.lib b/client/lib/engine/bin/PostConfEAC.lib
similarity index 100%
rename from client/engine/PostConfEAC.lib
rename to client/lib/engine/bin/PostConfEAC.lib
diff --git a/client/engine/Protocol.lib b/client/lib/engine/bin/Protocol.lib
similarity index 100%
rename from client/engine/Protocol.lib
rename to client/lib/engine/bin/Protocol.lib
diff --git a/client/engine/README.es.txt b/client/lib/engine/bin/README.es.txt
similarity index 100%
rename from client/engine/README.es.txt
rename to client/lib/engine/bin/README.es.txt
diff --git a/client/engine/Registry.lib b/client/lib/engine/bin/Registry.lib
similarity index 100%
rename from client/engine/Registry.lib
rename to client/lib/engine/bin/Registry.lib
diff --git a/client/engine/String.lib b/client/lib/engine/bin/String.lib
similarity index 100%
rename from client/engine/String.lib
rename to client/lib/engine/bin/String.lib
diff --git a/client/engine/System.lib b/client/lib/engine/bin/System.lib
similarity index 100%
rename from client/engine/System.lib
rename to client/lib/engine/bin/System.lib
diff --git a/client/engine/ToolsGNU.c b/client/lib/engine/bin/ToolsGNU.c
similarity index 100%
rename from client/engine/ToolsGNU.c
rename to client/lib/engine/bin/ToolsGNU.c
diff --git a/client/engine/UEFI.lib b/client/lib/engine/bin/UEFI.lib
similarity index 100%
rename from client/engine/UEFI.lib
rename to client/lib/engine/bin/UEFI.lib
diff --git a/installer/ogboot_installer.py b/installer/ogboot_installer.py
index 9e78e7c..68fdca5 100755
--- a/installer/ogboot_installer.py
+++ b/installer/ogboot_installer.py
@@ -478,13 +478,7 @@ def copyClientFiles():
 
     logger.info(f"Copying OpenGnsys Cloning Engine files in client library.")
     os.makedirs(f"{INSTALL_OGBOOT_TARGET}/client/lib/engine/bin", mode=0o775, exist_ok=True)
-    if 0 != subprocess.run (['rsync', '-aH', f'{REPO_DIR}/client/engine/', f'{INSTALL_OGBOOT_TARGET}/client/lib/engine/bin/']).returncode:
-        logger.error(f"Error while copying engine files")
-        errstatus = 1
-
-    logger.info(f"Copying OpenGnsys Cloning Engine files in client engine.")
-    os.makedirs(f"{INSTALL_OGBOOT_TARGET}/client/engine", mode=0o775, exist_ok=True)
-    if 0 != subprocess.run (['rsync', '-aH', f'{REPO_DIR}/client/engine/', f'{INSTALL_OGBOOT_TARGET}/client/engine/']).returncode:
+    if 0 != subprocess.run (['rsync', '-aH', f'{REPO_DIR}/client/lib/engine/bin/', f'{INSTALL_OGBOOT_TARGET}/client/lib/engine/bin/']).returncode:
         logger.error(f"Error while copying engine files")
         errstatus = 1