diff --git a/.infrahub.yml b/.infrahub.yml
index f7f584e..a2e5752 100644
--- a/.infrahub.yml
+++ b/.infrahub.yml
@@ -1,18 +1,18 @@
 ---
 schemas:
-  - schemas
+  - infrahub/schemas
 menus:
-  - menus
+  - infrahub/menus
 objects:
-  - objects/01-foundation.yml
-  - objects/02-fabric.yml
-  - objects/03-devices.yml
-  - objects/04-interfaces.yml
-  - objects/05-ipam.yml
-  - objects/06-vlans-vxlan.yml
-  - objects/07-interface-vlans.yml
-  - objects/08-ipam-vlans.yml
-  - objects/09-bgp.yml
-  - objects/10-bgp-sessions.yml
-  - objects/11-vrfs.yml
-  - objects/12-mlag.yml
+  - infrahub/objects/01-foundation.yml
+  - infrahub/objects/02-fabric.yml
+  - infrahub/objects/03-devices.yml
+  - infrahub/objects/04-interfaces.yml
+  - infrahub/objects/05-ipam.yml
+  - infrahub/objects/06-vlans-vxlan.yml
+  - infrahub/objects/07-interface-vlans.yml
+  - infrahub/objects/08-ipam-vlans.yml
+  - infrahub/objects/09-bgp.yml
+  - infrahub/objects/10-bgp-sessions.yml
+  - infrahub/objects/11-vrfs.yml
+  - infrahub/objects/12-mlag.yml
diff --git a/menus/fabric-menu.yml b/infrahub/menus/fabric-menu.yml
similarity index 99%
rename from menus/fabric-menu.yml
rename to infrahub/menus/fabric-menu.yml
index 49b5bc6..8c15e34 100644
--- a/menus/fabric-menu.yml
+++ b/infrahub/menus/fabric-menu.yml
@@ -2,7 +2,7 @@
 # Custom menu for EVPN-VXLAN Fabric Orchestrator
 # Organizes schema nodes into logical topology-aligned categories
 ---
-apiversion: infrahub.app/v1
+apiVersion: infrahub.app/v1
 kind: Menu
 spec:
   data:
diff --git a/objects/01-foundation.yml b/infrahub/objects/01-foundation.yml
similarity index 100%
rename from objects/01-foundation.yml
rename to infrahub/objects/01-foundation.yml
diff --git a/objects/02-fabric.yml b/infrahub/objects/02-fabric.yml
similarity index 100%
rename from objects/02-fabric.yml
rename to infrahub/objects/02-fabric.yml
diff --git a/objects/03-devices.yml b/infrahub/objects/03-devices.yml
similarity index 100%
rename from objects/03-devices.yml
rename to infrahub/objects/03-devices.yml
diff --git a/objects/04-interfaces.yml b/infrahub/objects/04-interfaces.yml
similarity index 100%
rename from objects/04-interfaces.yml
rename to infrahub/objects/04-interfaces.yml
diff --git a/objects/05-ipam.yml b/infrahub/objects/05-ipam.yml
similarity index 100%
rename from objects/05-ipam.yml
rename to infrahub/objects/05-ipam.yml
diff --git a/objects/06-vlans-vxlan.yml b/infrahub/objects/06-vlans-vxlan.yml
similarity index 100%
rename from objects/06-vlans-vxlan.yml
rename to infrahub/objects/06-vlans-vxlan.yml
diff --git a/objects/07-interface-vlans.yml b/infrahub/objects/07-interface-vlans.yml
similarity index 100%
rename from objects/07-interface-vlans.yml
rename to infrahub/objects/07-interface-vlans.yml
diff --git a/objects/08-ipam-vlans.yml b/infrahub/objects/08-ipam-vlans.yml
similarity index 100%
rename from objects/08-ipam-vlans.yml
rename to infrahub/objects/08-ipam-vlans.yml
diff --git a/objects/09-bgp.yml b/infrahub/objects/09-bgp.yml
similarity index 100%
rename from objects/09-bgp.yml
rename to infrahub/objects/09-bgp.yml
diff --git a/objects/10-bgp-sessions.yml b/infrahub/objects/10-bgp-sessions.yml
similarity index 100%
rename from objects/10-bgp-sessions.yml
rename to infrahub/objects/10-bgp-sessions.yml
diff --git a/objects/11-vrfs.yml b/infrahub/objects/11-vrfs.yml
similarity index 100%
rename from objects/11-vrfs.yml
rename to infrahub/objects/11-vrfs.yml
diff --git a/objects/12-mlag.yml b/infrahub/objects/12-mlag.yml
similarity index 100%
rename from objects/12-mlag.yml
rename to infrahub/objects/12-mlag.yml
diff --git a/schemas/README.md b/infrahub/schemas/README.md
similarity index 100%
rename from schemas/README.md
rename to infrahub/schemas/README.md
diff --git a/schemas/base.yml b/infrahub/schemas/base.yml
similarity index 100%
rename from schemas/base.yml
rename to infrahub/schemas/base.yml
diff --git a/schemas/bgp.yml b/infrahub/schemas/bgp.yml
similarity index 100%
rename from schemas/bgp.yml
rename to infrahub/schemas/bgp.yml
diff --git a/schemas/extensions.yml b/infrahub/schemas/extensions.yml
similarity index 100%
rename from schemas/extensions.yml
rename to infrahub/schemas/extensions.yml
diff --git a/schemas/mlag.yml b/infrahub/schemas/mlag.yml
similarity index 100%
rename from schemas/mlag.yml
rename to infrahub/schemas/mlag.yml
diff --git a/schemas/vlan_vxlan.yml b/infrahub/schemas/vlan_vxlan.yml
similarity index 100%
rename from schemas/vlan_vxlan.yml
rename to infrahub/schemas/vlan_vxlan.yml
diff --git a/schemas/vrf.yml b/infrahub/schemas/vrf.yml
similarity index 100%
rename from schemas/vrf.yml
rename to infrahub/schemas/vrf.yml