diff --git a/federation/rest.yaml b/federation/rest.yaml
index 05b9cd110..5690e6314 100644
--- a/federation/rest.yaml
+++ b/federation/rest.yaml
@@ -130,7 +130,7 @@ endpoints:
   - title: Manage structure
     description: Manage structure
     entrypoint: manageStructure
-    path: "/nodes/{nodeID}"
+    path: "/nodes/{nodeID}/modules"
     authentication: []
     imports:
       - github.com/cortezaproject/corteza-server/federation/types
@@ -138,7 +138,7 @@ endpoints:
       - name: readExposed
         method: GET
         title: Exposed settings for module
-        path: "/modules/{moduleID}/exposed"
+        path: "/{moduleID}/exposed"
         parameters:
           path:
             - type: uint64
@@ -152,7 +152,7 @@ endpoints:
       - name: createExposed
         method: PUT
         title: Add module to federation
-        path: "/modules"
+        path: "/"
         parameters:
           path:
             - type: uint64
@@ -171,7 +171,7 @@ endpoints:
       - name: removeExposed
         method: DELETE
         title: Remove from federation
-        path: "/modules/{moduleID}/exposed"
+        path: "/{moduleID}/exposed"
         parameters:
           path:
             - type: uint64
@@ -185,7 +185,7 @@ endpoints:
       - name: readShared
         method: GET
         title: Shared settings for module
-        path: "/modules/{moduleID}/shared"
+        path: "/{moduleID}/shared"
         parameters:
           path:
             - type: uint64
@@ -199,7 +199,7 @@ endpoints:
       - name: createMappings
         method: PUT
         title: Add fields mappings to federated module
-        path: "/modules/{moduleID}/mapped"
+        path: "/{moduleID}/mapped"
         parameters:
           path:
             - type: uint64
@@ -222,7 +222,7 @@ endpoints:
       - name: readMappings
         method: GET
         title: Fields mappings for module
-        path: "/modules/{moduleID}/mapped"
+        path: "/{moduleID}/mapped"
         parameters:
           path:
             - type: uint64
@@ -236,7 +236,7 @@ endpoints:
       - name: listAll
         method: GET
         title: List of shared/exposed modules
-        path: "/modules"
+        path: "/"
         parameters:
           path:
             - type: uint64
diff --git a/federation/rest/handlers/manageStructure.go b/federation/rest/handlers/manageStructure.go
index b6f82c6d7..9671743b6 100644
--- a/federation/rest/handlers/manageStructure.go
+++ b/federation/rest/handlers/manageStructure.go
@@ -191,11 +191,11 @@ func (h ManageStructure) MountRoutes(r chi.Router, middlewares ...func(http.Hand
 	r.Group(func(r chi.Router) {
 		r.Use(middlewares...)
 		r.Get("/nodes/{nodeID}/modules/{moduleID}/exposed", h.ReadExposed)
-		r.Put("/nodes/{nodeID}/modules", h.CreateExposed)
+		r.Put("/nodes/{nodeID}/modules/", h.CreateExposed)
 		r.Delete("/nodes/{nodeID}/modules/{moduleID}/exposed", h.RemoveExposed)
 		r.Get("/nodes/{nodeID}/modules/{moduleID}/shared", h.ReadShared)
 		r.Put("/nodes/{nodeID}/modules/{moduleID}/mapped", h.CreateMappings)
 		r.Get("/nodes/{nodeID}/modules/{moduleID}/mapped", h.ReadMappings)
-		r.Get("/nodes/{nodeID}/modules", h.ListAll)
+		r.Get("/nodes/{nodeID}/modules/", h.ListAll)
 	})
 }
diff --git a/federation/rest/handlers/node.go b/federation/rest/handlers/node.go
index 31f53d1a0..1ff7a02a4 100644
--- a/federation/rest/handlers/node.go
+++ b/federation/rest/handlers/node.go
@@ -234,8 +234,8 @@ func NewNode(h NodeAPI) *Node {
 func (h Node) MountRoutes(r chi.Router, middlewares ...func(http.Handler) http.Handler) {
 	r.Group(func(r chi.Router) {
 		r.Use(middlewares...)
-		r.Get("/nodes", h.Search)
-		r.Post("/nodes", h.Create)
+		r.Get("/nodes/", h.Search)
+		r.Post("/nodes/", h.Create)
 		r.Post("/nodes/{nodeID}/uri", h.GenerateURI)
 		r.Post("/nodes/{nodeID}", h.Update)
 		r.Delete("/nodes/{nodeID}", h.Delete)