diff --git a/include/dune b/include/dune
new file mode 100644
index 00000000..3418869c
--- /dev/null
+++ b/include/dune
@@ -0,0 +1,5 @@
+(library
+ (name include)
+ ; (wrapped false)
+ (modules taler_signatures)
+ (libraries))
diff --git a/lib/taler_signatures.ml b/include/taler_signatures.ml
similarity index 100%
rename from lib/taler_signatures.ml
rename to include/taler_signatures.ml
diff --git a/lib/dune b/lib/dune
deleted file mode 100644
index 5b58f3c2..00000000
--- a/lib/dune
+++ /dev/null
@@ -1,25 +0,0 @@
-(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/lib/amount.ml b/src/amount.ml
similarity index 100%
rename from lib/amount.ml
rename to src/amount.ml
diff --git a/lib/amount.mli b/src/amount.mli
similarity index 100%
rename from lib/amount.mli
rename to src/amount.mli
diff --git a/lib/b32.ml b/src/b32.ml
similarity index 100%
rename from lib/b32.ml
rename to src/b32.ml
diff --git a/src/dune b/src/dune
index f092e1ad..e8fa36cf 100644
--- a/src/dune
+++ b/src/dune
@@ -7,13 +7,10 @@
 (library
  (name mte)
  (wrapped false)
- (modules :standard \ mte)
+ (modules :standard \ mte b32)
  (libraries
-  amount
   b32
   include
-  parse_config
-  headers_lib
   ;
   caqti
   caqti-miou
@@ -29,6 +26,11 @@
   cohttp
   ptime))
 
+(library ; crockford base32
+ (name b32)
+ (modules b32)
+ (libraries base32))
+
 (rule
  (target assets_crunch.ml)
  (deps
diff --git a/lib/headers_lib.ml b/src/headers_lib.ml
similarity index 100%
rename from lib/headers_lib.ml
rename to src/headers_lib.ml
diff --git a/lib/parse_config.ml b/src/parse_config.ml
similarity index 100%
rename from lib/parse_config.ml
rename to src/parse_config.ml
diff --git a/tools/dune b/tools/dune
new file mode 100644
index 00000000..3375a448
--- /dev/null
+++ b/tools/dune
@@ -0,0 +1,5 @@
+(executable
+ (public_name offline)
+ (name offline)
+ (modules offline)
+ (libraries cmdliner bos fmt mirage-crypto ptime mte))
diff --git a/tools/offline.ml b/tools/offline.ml
new file mode 100644
index 00000000..5d06c89b
--- /dev/null
+++ b/tools/offline.ml
@@ -0,0 +1 @@
+let () = Fmt.pr "hello~@."; ()