diff --git a/node-tools/cmd/node-tools/approvals_integration_test.go b/node-tools/cmd/node-tools/approvals_integration_test.go
index 2eb2ed1..529bbc1 100644
--- a/node-tools/cmd/node-tools/approvals_integration_test.go
+++ b/node-tools/cmd/node-tools/approvals_integration_test.go
@@ -12,7 +12,7 @@ import (
 
 	"git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient"
 	seat "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel"
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	"git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/seatdef"
 	"github.com/nats-io/nats.go"
diff --git a/node-tools/internal/approval/approval_test.go b/node-tools/internal/approval/approval_test.go
index 8bc98ff..d722adb 100644
--- a/node-tools/internal/approval/approval_test.go
+++ b/node-tools/internal/approval/approval_test.go
@@ -10,7 +10,7 @@ import (
 
 	"git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient"
 	seat "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel"
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	stdio "git.novox.be/novox/mesh-sdk/go"
 	gate "git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/keys"
diff --git a/node-tools/internal/approval/contracts.go b/node-tools/internal/approval/contracts.go
index 928821f..46e3b37 100644
--- a/node-tools/internal/approval/contracts.go
+++ b/node-tools/internal/approval/contracts.go
@@ -12,7 +12,7 @@ import (
 
 	assignerseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner"
 	condseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions"
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	gate "git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/views"
 )
diff --git a/node-tools/internal/approval/marks_test.go b/node-tools/internal/approval/marks_test.go
index a18bfd7..a38f217 100644
--- a/node-tools/internal/approval/marks_test.go
+++ b/node-tools/internal/approval/marks_test.go
@@ -10,7 +10,7 @@ import (
 	"git.novox.be/novox/mesh-sdk/go/keys"
 	"git.novox.be/novox/mesh-sdk/go/views"
 
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	gate "git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/seatdef"
 )
diff --git a/node-tools/internal/console/wait.go b/node-tools/internal/console/wait.go
index d15df4d..ad08d72 100644
--- a/node-tools/internal/console/wait.go
+++ b/node-tools/internal/console/wait.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"time"
 
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient"
 	"git.novox.be/novox/mesh-sdk/go/buscompose"
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 
diff --git a/node-tools/internal/console/wait_test.go b/node-tools/internal/console/wait_test.go
index c0af795..984aca2 100644
--- a/node-tools/internal/console/wait_test.go
+++ b/node-tools/internal/console/wait_test.go
@@ -16,8 +16,8 @@ import (
 
 	"git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient"
 	opseat "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel"
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	stdio "git.novox.be/novox/mesh-sdk/go"
 	"git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/seatdef"
diff --git a/node-tools/internal/firstview/approval.go b/node-tools/internal/firstview/approval.go
index e6f911b..24a8aed 100644
--- a/node-tools/internal/firstview/approval.go
+++ b/node-tools/internal/firstview/approval.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient"
 	"git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/seatdef"
 
diff --git a/node-tools/internal/firstview/firstview_integration_test.go b/node-tools/internal/firstview/firstview_integration_test.go
index e3afd0f..48879d9 100644
--- a/node-tools/internal/firstview/firstview_integration_test.go
+++ b/node-tools/internal/firstview/firstview_integration_test.go
@@ -17,9 +17,9 @@ import (
 	"git.novox.be/novox/mesh-sdk/go/views"
 	"github.com/nats-io/nats.go"
 
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
-	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
-	delivery "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient"
+	catalogseat "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
+	delivery "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshdelivery"
 
 	"github.com/novox/mesh-tools/node-tools/internal/bus"
 	mt "github.com/novox/mesh-tools/node-tools/internal/meshtest"
diff --git a/node-tools/internal/runtime/ledgers_test.go b/node-tools/internal/runtime/ledgers_test.go
index 53e9780..3b58606 100644
--- a/node-tools/internal/runtime/ledgers_test.go
+++ b/node-tools/internal/runtime/ledgers_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"slices"
 	"sort"
 	"strings"
 	"testing"
diff --git a/node-tools/internal/runtime/runtime_test.go b/node-tools/internal/runtime/runtime_test.go
index 775b920..b8e8906 100644
--- a/node-tools/internal/runtime/runtime_test.go
+++ b/node-tools/internal/runtime/runtime_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/novox/mesh-tools/node-tools/internal/approval"
+	"git.novox.be/novox/mesh-sdk/go/approval"
 	"github.com/novox/mesh-tools/node-tools/internal/bus"
 	"github.com/novox/mesh-tools/node-tools/internal/launch"
 	mt "github.com/novox/mesh-tools/node-tools/internal/meshtest"
@@ -208,6 +208,7 @@ func (g unservingGate) Unserved(module, _ string, registered []string) []string
 	return missing
 }
 func (unservingGate) Run(_ approval.Call, run func() (any, error)) (any, error) { return run() }
+func (unservingGate) Approvals(string) (approval.Approvals, error)              { return approval.Approvals{}, nil }
 
 // An entrypoint that is not executable is refused by name, and the others serve (ADR 0193). A bundle whose marks name a
 // tool it does not register is refused at the load, serving no tool of its module, and one that registers it serves