diff --git a/src/framework/constrSys.ml b/src/constraint/constrSys.ml
similarity index 100%
rename from src/framework/constrSys.ml
rename to src/constraint/constrSys.ml
diff --git a/src/constraint/constraint.mld b/src/constraint/constraint.mld
new file mode 100644
index 0000000000..695e7bfa0d
--- /dev/null
+++ b/src/constraint/constraint.mld
@@ -0,0 +1,16 @@
+{0 Library goblint.constraint}
+This library is unwrapped and provides the following top-level modules.
+For better context, see {!Goblint_lib} which also documents these modules.
+
+
+{1 Framework}
+
+{2 Specification}
+{!modules:
+ConstrSys
+}
+
+{2 Results}
+{!modules:
+VarQuery
+}
diff --git a/src/constraint/dune b/src/constraint/dune
new file mode 100644
index 0000000000..2d11b9010f
--- /dev/null
+++ b/src/constraint/dune
@@ -0,0 +1,21 @@
+(include_subdirs no)
+
+(library
+ (name goblint_constraint)
+ (public_name goblint.constraint)
+ (wrapped false) ; TODO: wrap
+ (libraries
+   batteries.unthreaded
+   goblint_std
+   goblint_common
+   goblint_domain
+   goblint-cil)
+ (flags :standard -open Goblint_std)
+ (preprocess
+  (pps
+    ppx_deriving.std
+    ppx_deriving_hash
+    ppx_deriving_yojson))
+ (instrumentation (backend bisect_ppx)))
+
+(documentation)
diff --git a/src/framework/varQuery.ml b/src/constraint/varQuery.ml
similarity index 100%
rename from src/framework/varQuery.ml
rename to src/constraint/varQuery.ml
diff --git a/src/framework/varQuery.mli b/src/constraint/varQuery.mli
similarity index 100%
rename from src/framework/varQuery.mli
rename to src/constraint/varQuery.mli
diff --git a/src/dune b/src/dune
index eac6640451..59845b8e03 100644
--- a/src/dune
+++ b/src/dune
@@ -7,7 +7,7 @@
   (name goblint_lib)
   (public_name goblint.lib)
   (modules :standard \ goblint privPrecCompare apronPrecCompare messagesCompare)
-  (libraries goblint.sites goblint.build-info goblint-cil.all-features batteries.unthreaded qcheck-core.runner sha json-data-encoding jsonrpc cpu arg-complete fpath yaml yaml.unix uuidm goblint_timing catapult goblint_backtrace fileutils goblint_std goblint_config goblint_common goblint_domain goblint_library goblint_incremental goblint_tracing
+  (libraries goblint.sites goblint.build-info goblint-cil.all-features batteries.unthreaded qcheck-core.runner sha json-data-encoding jsonrpc cpu arg-complete fpath yaml yaml.unix uuidm goblint_timing catapult goblint_backtrace fileutils goblint_std goblint_config goblint_common goblint_domain goblint_constraint goblint_library goblint_incremental goblint_tracing
     ; Conditionally compile based on whether apron optional dependency is installed or not.
     ; Alternative dependencies seem like the only way to optionally depend on optional dependencies.
     ; See: https://dune.readthedocs.io/en/stable/concepts.html#alternative-dependencies.
diff --git a/src/index.mld b/src/index.mld
index 76b9d230dd..3ed2b8079f 100644
--- a/src/index.mld
+++ b/src/index.mld
@@ -16,6 +16,9 @@ This {{!page-common}unwrapped library} contains various common modules extracted
 {2 Library goblint.domain}
 This {{!page-domain}unwrapped library} contains various domain modules extracted from {!Goblint_lib}.
 
+{2 Library goblint.constraint}
+This {{!page-constraint}unwrapped library} contains various constraint system modules extracted from {!Goblint_lib}.
+
 {2 Library goblint.library}
 This {{!page-library}unwrapped library} contains various library specification modules extracted from {!Goblint_lib}.