diff --git a/include/dune b/include/dune
deleted file mode 100644
index 6873d83e..00000000
--- a/include/dune
+++ /dev/null
@@ -1,10 +0,0 @@
-(library
- (name include)
- ; (wrapped false)
- (modules taler_signatures)
- (libraries))
-
-(library ; todo: should I have a /lib?
- (name parse_config)
- (modules parse_config)
- (libraries mirage-crypto-ec ptime fmt angstrom uri amount b32))
diff --git a/src/amount.ml b/lib/amount.ml
similarity index 100%
rename from src/amount.ml
rename to lib/amount.ml
diff --git a/src/amount.mli b/lib/amount.mli
similarity index 100%
rename from src/amount.mli
rename to lib/amount.mli
diff --git a/src/b32.ml b/lib/b32.ml
similarity index 100%
rename from src/b32.ml
rename to lib/b32.ml
diff --git a/lib/dune b/lib/dune
new file mode 100644
index 00000000..5b58f3c2
--- /dev/null
+++ b/lib/dune
@@ -0,0 +1,25 @@
+(library
+ (name include)
+ ; (wrapped false)
+ (modules taler_signatures)
+ (libraries))
+
+(library
+ (name parse_config)
+ (modules parse_config)
+ (libraries mirage-crypto-ec ptime fmt angstrom uri amount b32))
+
+(library ; crockford base32
+ (name b32)
+ (modules b32)
+ (libraries base32))
+
+(library
+ (name amount)
+ (modules amount)
+ (libraries angstrom fmt zarith))
+
+(library
+ (name headers_lib)
+ (modules headers_lib)
+ (libraries angstrom fmt))
diff --git a/src/headers_lib.ml b/lib/headers_lib.ml
similarity index 100%
rename from src/headers_lib.ml
rename to lib/headers_lib.ml
diff --git a/include/parse_config.ml b/lib/parse_config.ml
similarity index 100%
rename from include/parse_config.ml
rename to lib/parse_config.ml
diff --git a/include/taler_signatures.ml b/lib/taler_signatures.ml
similarity index 100%
rename from include/taler_signatures.ml
rename to lib/taler_signatures.ml
diff --git a/src/dune b/src/dune
index db08080e..b378bc9e 100644
--- a/src/dune
+++ b/src/dune
@@ -7,13 +7,13 @@
 (library
  (name mte)
  (wrapped false)
- (modules :standard \ mte b32 amount)
+ (modules :standard \ mte)
  (libraries
   amount
   b32
-  ;
   include
   parse_config
+  headers_lib
   ;
   caqti
   caqti-miou
@@ -31,16 +31,6 @@
   cohttp
   ptime))
 
-(library ; crockford base32
- (name b32)
- (modules b32)
- (libraries base32))
-
-(library
- (name amount)
- (modules amount)
- (libraries angstrom fmt zarith))
-
 (rule
  (target assets_crunch.ml)
  (deps