diff --git a/CMakeLists.txt b/CMakeLists.txt
index f054db9..1700f35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,17 +15,7 @@ set (PIPEDAL_EXCLUDE_TESTS false)
 include(CTest)
 enable_testing()
 
-
-#add_subdirectory("submodules/pipedal_p2pd")
-add_subdirectory("modules/SQLiteCpp")
-
-set(SDBUSCPP_BUILD_CODEGEN off)
-set(SDBUSCPP_INSTALL off)
-set(SDBUSCPP_BUILD_DOCS off)
-set(SDBUSCPP_BUILD_DOXYGEN_DOCS off)
-set(SDBUSCPP_BUILD_TESTS off)
-add_subdirectory("modules/sdbus-cpp")
-
+add_subdirectory("modules")
 
 add_subdirectory("PiPedalCommon")
 
@@ -124,7 +114,7 @@ set(CPACK_DEBIAN_PACKAGE_SIGN_ALGORITHM "detached")
 set(CPACK_DEBIAN_PACKAGE_SIGN_TYPE "origin")
 
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA 
-   "${CMAKE_CURRENT_SOURCE_DIR}/debian/shlibs.override;${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm;${CMAKE_CURRENT_SOURCE_DIR}/debian/shlibs.local"
+   "${CMAKE_CURRENT_SOURCE_DIR}/debian/shlibs.override;${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm"
    )
 
 
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index cf69f9d..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-libzip 4 libzip4 (>= 1.0) | libzip5 (>= 1.0)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
new file mode 100644
index 0000000..820457b
--- /dev/null
+++ b/modules/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.16.0)
+
+add_subdirectory("SQLiteCpp")
+
+set(SDBUSCPP_BUILD_CODEGEN off)
+set(SDBUSCPP_INSTALL off)
+set(SDBUSCPP_BUILD_DOCS off)
+set(SDBUSCPP_BUILD_DOXYGEN_DOCS off)
+set(SDBUSCPP_BUILD_TESTS off)
+add_subdirectory("sdbus-cpp")
+
+
+option(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" OFF)
+option(BUILD_REGRESS "Build regression tests" OFF)
+option(BUILD_OSSFUZZ "Build fuzzers for ossfuzz" OFF)
+option(BUILD_EXAMPLES "Build examples" OFF)
+option(BUILD_DOC "Build documentation" OFF)
+add_subdirectory("libzip")
diff --git a/todo.txt b/todo.txt
index e66b1d2..340a01b 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,5 @@
 add apt install expat 
+sudo apt install libbz2-dev
 
 
 Carla Project icons.