diff --git a/.gitmodules b/.gitmodules
index a4a0083..7a9f600 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "tests/acquire-video-runtime"]
-	path = tests/acquire-video-runtime
-	url = ../acquire-video-runtime.git
-	branch = main
-[submodule "tests/acquire-driver-common"]
-	path = tests/acquire-driver-common
-	url = ../acquire-driver-common.git
-	branch = main
-[submodule "src/acquire-core-libs"]
-	path = src/acquire-core-libs
-	url = ../acquire-core-libs.git
-	branch = main
+[submodule "acquire-common"]
+	path = acquire-common
+	url = ../acquire-common.git
diff --git a/acquire-common b/acquire-common
new file mode 160000
index 0000000..6f4e6ff
--- /dev/null
+++ b/acquire-common
@@ -0,0 +1 @@
+Subproject commit 6f4e6ff976b313d5046fbfc3703a17399fe6440c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3136f16..ba73a0d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 if (NOT TARGET acquire-core-libs)
-    add_subdirectory(acquire-core-libs)
+    add_subdirectory(../acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
 endif ()
 
 set(tgt acquire-driver-hdcam)
diff --git a/src/acquire-core-libs b/src/acquire-core-libs
deleted file mode 160000
index 8bea9c8..0000000
--- a/src/acquire-core-libs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8bea9c8ab8806d481ae943d3577c9adcede98672
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 22d3a30..d4bacec 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,8 +2,8 @@ if(${NOTEST})
     message(STATUS "Skipping test targets")
 else()
     set(NOTEST "TRUE")
-    aq_require(acquire-video-runtime)
-    aq_require(acquire-driver-common)
+    add_subdirectory(../acquire-common/acquire-driver-common ${CMAKE_CURRENT_BINARY_DIR}/acquire-driver-common)
+    add_subdirectory(../acquire-common/acquire-video-runtime ${CMAKE_CURRENT_BINARY_DIR}/acquire-video-runtime)
     set(NOTEST "FALSE")
 
     #
diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common
deleted file mode 160000
index 356ea81..0000000
--- a/tests/acquire-driver-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 356ea817417e941c18cbb6901b7a05a916cb1700
diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime
deleted file mode 160000
index 4d21090..0000000
--- a/tests/acquire-video-runtime
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d21090545e05f830735d004484826a7d6bb8399