diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index dd6fd6d..bb56aba 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -7,7 +7,7 @@ import (
 
 	agentapi "git.g3e.fr/syonad/two/internal/api/agent"
 	configuration "git.g3e.fr/syonad/two/internal/config/agent"
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	agentmetrics "git.g3e.fr/syonad/two/internal/prometheus/agent"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
 	promserver "git.g3e.fr/syonad/two/pkg/prometheus"
diff --git a/internal/api/agent/server.go b/internal/api/agent/server.go
index 7f3247c..276b416 100644
--- a/internal/api/agent/server.go
+++ b/internal/api/agent/server.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	"github.com/dgraph-io/badger/v4"
 )
 
diff --git a/internal/api/agent/subnet.go b/internal/api/agent/subnet.go
index 8ea3d19..61cbd6f 100644
--- a/internal/api/agent/subnet.go
+++ b/internal/api/agent/subnet.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
@@ -66,4 +66,3 @@ func (s *Server) deleteSubnet(w http.ResponseWriter, r *http.Request, name strin
 	w.WriteHeader(http.StatusAccepted)
 	json.NewEncoder(w).Encode(Subnet{Name: name, State: "deleting"})
 }
-
diff --git a/internal/api/agent/subnets.go b/internal/api/agent/subnets.go
index 90faaff..18fb81f 100644
--- a/internal/api/agent/subnets.go
+++ b/internal/api/agent/subnets.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
diff --git a/internal/api/agent/vpc.go b/internal/api/agent/vpc.go
index 8151e1d..fd1bfdb 100644
--- a/internal/api/agent/vpc.go
+++ b/internal/api/agent/vpc.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
@@ -44,4 +44,3 @@ func (s *Server) deleteVpc(w http.ResponseWriter, _ *http.Request, name string)
 	w.WriteHeader(http.StatusAccepted)
 	json.NewEncoder(w).Encode(VPC{Name: name, State: "deleting"})
 }
-
diff --git a/internal/api/agent/vpcs.go b/internal/api/agent/vpcs.go
index a6ee70e..735259c 100644
--- a/internal/api/agent/vpcs.go
+++ b/internal/api/agent/vpcs.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"git.g3e.fr/syonad/two/internal/dispatcher"
+	dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
 	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
diff --git a/internal/dispatcher/dispatcher.go b/internal/dispatcher/agent/dispatcher.go
similarity index 100%
rename from internal/dispatcher/dispatcher.go
rename to internal/dispatcher/agent/dispatcher.go
diff --git a/internal/dispatcher/subnet_commands.go b/internal/dispatcher/agent/subnet_commands.go
similarity index 100%
rename from internal/dispatcher/subnet_commands.go
rename to internal/dispatcher/agent/subnet_commands.go
diff --git a/internal/dispatcher/vpc_commands.go b/internal/dispatcher/agent/vpc_commands.go
similarity index 100%
rename from internal/dispatcher/vpc_commands.go
rename to internal/dispatcher/agent/vpc_commands.go