diff --git a/src/pages/labellingHome/index.js b/src/pages/labellingHome/index.js
index cff2e6f..1d1d00e 100644
--- a/src/pages/labellingHome/index.js
+++ b/src/pages/labellingHome/index.js
@@ -9,12 +9,12 @@ function LabelingHome() {
   const data = [
     {
       name: 'Location Label',
-      path: '/location-labeling',
+      path: '/setup/labeling/location-labeling',
       icon: <LocationLabelIcon color="#007AFF" />
     },
     {
       name: 'Widget Label',
-      path: '/',
+      path: '/setup/labeling',
       icon: <WidgetLabelIcon color="#007AFF" />
     }
   ];
diff --git a/src/pages/setup/index.js b/src/pages/setup/index.js
index 57b3d05..a82b191 100644
--- a/src/pages/setup/index.js
+++ b/src/pages/setup/index.js
@@ -11,22 +11,22 @@ function SetupHome() {
   const data = [
     {
       name: 'Warehouse',
-      path: '/warehouse',
+      path: '/setup/warehouse',
       icon: <WarehouseIcon width={96} height={96} color="#007AFF" />
     },
     {
       name: 'Inventory',
-      path: '/inventory',
+      path: '/setup/inventory',
       icon: <InventoryIcon width={96} height={96} color="#007AFF" />
     },
     {
       name: 'User & Access',
-      path: '/',
+      path: '/setup/users-access',
       icon: <ProfileCircleIcon width={96} height={96} color="#007AFF" />
     },
     {
       name: 'Labeling',
-      path: '/labeling',
+      path: '/setup/labeling',
       icon: <LabelIcon width={96} height={96} color="#007AFF" />
     }
   ];
diff --git a/src/pages/setupInventory/index.js b/src/pages/setupInventory/index.js
index d3bfd0d..c1feb2d 100644
--- a/src/pages/setupInventory/index.js
+++ b/src/pages/setupInventory/index.js
@@ -18,7 +18,7 @@ function SetupInventory() {
     },
     {
       name: 'Products',
-      path: { update: '/', addNew: '/inventory-new', cycleCount: '/', list: '/' },
+      path: { update: '/', addNew: '/setup/inventory/inventory-new', cycleCount: '/', list: '/' },
       icon: <ProductsIcon />
     },
     {
diff --git a/src/pages/warehouse/index.js b/src/pages/warehouse/index.js
index fb7d6ba..0d5883d 100644
--- a/src/pages/warehouse/index.js
+++ b/src/pages/warehouse/index.js
@@ -28,7 +28,11 @@ function WarehouseScreen() {
   return (
     <DashboardLayout>
       <DashboardNavbar>
-        <MDButton sx={{ ml: 3 }} color="primary" onClick={() => navigate('/warehouse-form')}>
+        <MDButton
+          sx={{ ml: 3 }}
+          color="primary"
+          onClick={() => navigate('/setup/warehouse/add-warehouse')}
+        >
           + Add new
         </MDButton>
       </DashboardNavbar>
@@ -36,7 +40,7 @@ function WarehouseScreen() {
         tiles={warehouseData.map((warehouse) => ({
           ...warehouse,
           icon: <WarehouseIcon height={96} width={96} />,
-          path: '/edit-warehouse-design-form'
+          path: '/setup/warehouse/edit-warehouse'
         }))}
       />
       <Footer />
diff --git a/src/routes/index.js b/src/routes/index.js
index 43da933..3a6fa37 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -131,57 +131,59 @@ const protectedRoutes = [
       {
         name: 'Inventory Home',
         key: 'inventory',
-        route: '/inventory',
+        route: '/setup/inventory',
         component: <SetupInventory />
       },
+      {
+        name: 'Warehouse Design',
+        key: 'warehouse',
+        route: '/setup/warehouse',
+        component: <WarehouseScreen />
+      },
       {
         name: 'Inventory Definition',
         key: 'inventory-new',
         hide: true,
-        route: '/inventory-new',
+        route: '/setup/inventory/inventory-new',
         component: <InventoryScreen />
       },
-      {
-        name: 'Warehouse Design',
-        key: 'warehouse',
-        route: '/warehouse',
-        component: <WarehouseScreen />
-      },
       {
         name: 'Location Labeling',
         key: 'location-labeling',
-        route: '/location-labeling',
+        hide: true,
+        route: '/setup/labeling/location-labeling',
         component: <LocationLabelingScreen />
       },
+      {
+        name: 'Users & Access',
+        key: 'users-access',
+        route: '/setup/users-access',
+        component: <UserAccessScreen />
+      },
       {
         name: 'Labeling',
         key: 'labeling',
-        hide: true,
-        route: '/labeling',
+        route: '/setup/labeling',
         component: <LabelingHome />
       },
       {
         name: 'Warehouse Details Table',
         key: 'warehouse-details-table',
-        route: '/warehouse-details-table',
+        hide: true,
+        route: '/setup/warehouse/warehouse-details-table',
         component: <WarehouseDetailsTables />
       },
       {
-        name: 'Users & Access',
-        key: 'users-access',
-        route: '/users-access',
-        component: <UserAccessScreen />
-      },
-      {
-        name: 'Add Warehouse Details',
-        key: 'warehouse-form',
-        route: '/warehouse-form',
+        name: 'Add Warehouse',
+        key: 'add-warehouse',
+        hide: true,
+        route: '/setup/warehouse/add-warehouse',
         component: <NewWarehouseDetails />
       },
       {
-        name: 'Edit Warehouse Details',
-        key: 'warehouse-form',
-        route: '/edit-warehouse-design-form',
+        name: 'Edit Warehouse',
+        key: 'edit-warehouse',
+        route: '/setup/warehouse/edit-warehouse',
         hide: true,
         component: <EditWarehouseDetails />
       }