diff --git a/src/config.ml b/src/config.ml
index 59c61d3b..54d929f8 100644
--- a/src/config.ml
+++ b/src/config.ml
@@ -211,10 +211,6 @@ module Coin = struct
   let all_coins = List.map parse_coin coin_sections
 end
 
-let spath s =
-  let open Fat.Spath in
-  match of_string s with Error (`Msg e) -> fail "%s" e | Ok v -> v
-
 module Exchange_secmod_rsa = struct
   let get field =
     let section = "taler-exchange-secmod-" ^ "rsa" in
diff --git a/src/dune b/src/dune
index e44363fe..641708ae 100644
--- a/src/dune
+++ b/src/dune
@@ -1,17 +1,23 @@
 (executable
  (name mte)
- (modules mte)
+ (modules
+  fat
+  global
+  headers
+  respond
+  pg_type
+  pg
+  mte
+  mte_terms
+  mte_info
+  mte_management
+  secmod_eddsa
+  secmod_rsa
+  keys
+  log_reporter)
  (link_flags :standard -cclib "-z solo5-abi=hvt")
- (libraries mte)
- (foreign_stubs
-  (language c)
-  (names manifest)))
-
-(library
- (name mte)
- (wrapped false)
- (modules :standard \ mte b32)
  (libraries
+  mte
   ;
   mkernel
   mnet
@@ -26,23 +32,53 @@
   mirage-ptime.solo5
   mfat
   ;
-  b32
-  ;
   caqti
   caqti-miou
   caqti-mnet
   caqti-driver-pgx
   pgx
   ;
-  bin
-  jsont
-  cohttp ; just for header stuff
-  duration
-  kdf.hkdf
-  digestif
+  )
+ (foreign_stubs
+  (language c)
+  (names manifest)))
+
+(library
+ (name mte)
+ (wrapped false)
+ (modules
+  syntax
+  amount
+  libtool_version
+  time
+  assets_crunch
+  assets
+  hash
+  eddsa
+  rsa
+  signkey
+  denomination
+  config_parser
+  config
+  taler_signatures
+  signatures
+  api)
+ (libraries
+  b32
+  ;
   fmt
   logs
-  logs.fmt))
+  logs.fmt
+  bin
+  caqti
+  jsont
+  jsont.bytesrw
+  digestif
+  kdf.hkdf
+  mirage-crypto-ec
+  mirage-crypto-pk
+  fpath
+  cohttp))
 
 (library ; crockford base32
  (name b32)
diff --git a/src/secmod_eddsa.ml b/src/secmod_eddsa.ml
index 15e9868d..ed5c63c0 100644
--- a/src/secmod_eddsa.ml
+++ b/src/secmod_eddsa.ml
@@ -24,9 +24,13 @@ module Spath = Mfat.Spath
 module Cfg = struct
   include Config.Exchange_secmod_eddsa
 
+  let to_spath s =
+    let open Fat.Spath in
+    match of_string s with Error (`Msg e) -> Fmt.failwith "%s" e | Ok v -> v
+
   (* 8.3 filenames for FAT *)
-  let key_dir = Config.spath "/EDDSA"
-  let sm_key = Config.spath "/SM_EDDSA"
+  let key_dir = to_spath "/EDDSA"
+  let sm_key = to_spath "/SM_EDDSA"
 end
 
 type key = {
diff --git a/src/secmod_rsa.ml b/src/secmod_rsa.ml
index 2637af66..5b198aa9 100644
--- a/src/secmod_rsa.ml
+++ b/src/secmod_rsa.ml
@@ -27,8 +27,12 @@ end
 module Cfg = struct
   include Config.Exchange_secmod_rsa
 
-  let key_dir = Config.spath "/RSA"
-  let sm_key = Config.spath "/SM_RSA"
+  let to_spath s =
+    let open Fat.Spath in
+    match of_string s with Error (`Msg e) -> Fmt.failwith "%s" e | Ok v -> v
+
+  let key_dir = to_spath "/RSA"
+  let sm_key = to_spath "/SM_RSA"
   let coin_config_list = List.map Coin_config.of_coin Config.Coin.all_coins
 
   let get_coin_config ~section_name =