diff --git a/node-tools/go.mod b/node-tools/go.mod
index 54e4d8b..9a18092 100644
--- a/node-tools/go.mod
+++ b/node-tools/go.mod
@@ -8,8 +8,8 @@ require (
 	git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000
-	git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000
-	git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000
+	git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000
+	git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000
 	github.com/nats-io/nats.go v1.54.0
 	golang.org/x/sys v0.48.0
 )
diff --git a/node-tools/internal/console/address.go b/node-tools/internal/console/address.go
index b8860a7..d1e9c9e 100644
--- a/node-tools/internal/console/address.go
+++ b/node-tools/internal/console/address.go
@@ -19,7 +19,7 @@ package console
 import (
 	assigner "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient"
 	"git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner"
-	"git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 
 	"context"
diff --git a/node-tools/internal/console/source_test.go b/node-tools/internal/console/source_test.go
index 027117f..cb9aeb6 100644
--- a/node-tools/internal/console/source_test.go
+++ b/node-tools/internal/console/source_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sync"
 
-	"git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 
 	"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/firstview/firstview.go b/node-tools/internal/firstview/firstview.go
index 9e60efd..2eab14b 100644
--- a/node-tools/internal/firstview/firstview.go
+++ b/node-tools/internal/firstview/firstview.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	condseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions"
-	"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/keys"
diff --git a/node-tools/internal/firstview/firstview_test.go b/node-tools/internal/firstview/firstview_test.go
index 997203b..22c5045 100644
--- a/node-tools/internal/firstview/firstview_test.go
+++ b/node-tools/internal/firstview/firstview_test.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	condseat "git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions"
-	"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"
 	"git.novox.be/novox/mesh-sdk/go/views"
 
 	"github.com/novox/mesh-tools/node-tools/internal/bus"
diff --git a/node-tools/internal/meshtest/meshtest.go b/node-tools/internal/meshtest/meshtest.go
index aafeef3..de71ef1 100644
--- a/node-tools/internal/meshtest/meshtest.go
+++ b/node-tools/internal/meshtest/meshtest.go
@@ -23,7 +23,7 @@ import (
 
 	assigner "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient"
 	seatassigner "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner"
-	meshcatalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
+	meshcatalog "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
 	"git.novox.be/novox/mesh-sdk/go/membership"
 
 	"github.com/nats-io/nats-server/v2/server"