diff --git a/src/App.jsx b/src/App.jsx
index 8936ad2..c8b9bc4 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -6,8 +6,8 @@ import MenuDrawerPrivate, { OPEN_WIDTH, MINI_WIDTH } from './components/MenuDraw
 import Footer from './components/Footer';
 import Dashboard from './private/dashboard/Dashboard';
 import UserManagement from './private/users/UserManagement';
-import ProductCollections from './private/catalogs/ProductCollections';
-import Categories from './private/categories/Categories';
+import ProductCollections from './private/catalogs/products/ProductCollections';
+import Categories from './private/catalogs/categories/Categories';
 import LoginPage from './private/LoginPage';
 import { Routes, Route, Navigate } from 'react-router-dom';
 import { useAuth } from './context/AuthContext';
diff --git a/src/api/furnitureVariantApi.js b/src/api/ProductsApi.js
similarity index 97%
rename from src/api/furnitureVariantApi.js
rename to src/api/ProductsApi.js
index d815c9c..b98bb6d 100644
--- a/src/api/furnitureVariantApi.js
+++ b/src/api/ProductsApi.js
@@ -1,4 +1,4 @@
-export default class FurnitureVariantApi {
+export default class ProductsApi {
   constructor(token) {
     this.baseUrl = 'https://inventory-bff.dream-views.com/api/v1/FurnitureVariant';
     this.token = token; 
diff --git a/src/components/MenuDrawerPrivate.jsx b/src/components/MenuDrawerPrivate.jsx
index 64a2011..31386bd 100644
--- a/src/components/MenuDrawerPrivate.jsx
+++ b/src/components/MenuDrawerPrivate.jsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import {
     Drawer, List, ListItemButton, ListItemIcon, ListItemText,
     Collapse, IconButton, Tooltip, Box, useMediaQuery, InputBase
diff --git a/src/private/categories/AddOrEditCategoryForm.jsx b/src/private/catalogs/categories/AddOrEditCategoryForm.jsx
similarity index 98%
rename from src/private/categories/AddOrEditCategoryForm.jsx
rename to src/private/catalogs/categories/AddOrEditCategoryForm.jsx
index a354ce8..deec321 100644
--- a/src/private/categories/AddOrEditCategoryForm.jsx
+++ b/src/private/catalogs/categories/AddOrEditCategoryForm.jsx
@@ -1,8 +1,8 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Box, Button, Paper, TextField, Typography, MenuItem, Chip } from '@mui/material';
-import { useAuth } from '../../context/AuthContext';
-import CategoriesApi from '../../api/CategoriesApi';
-import TagTypeApi from '../../api/TagTypeApi';
+import { useAuth } from '../../../context/AuthContext';
+import CategoriesApi from '../../../api/CategoriesApi';
+import TagTypeApi from '../../../api/TagTypeApi';
 import { jwtDecode } from 'jwt-decode';
 
 function slugify(s) {
diff --git a/src/private/categories/Categories.jsx b/src/private/catalogs/categories/Categories.jsx
similarity index 98%
rename from src/private/categories/Categories.jsx
rename to src/private/catalogs/categories/Categories.jsx
index c2cdfa5..449386b 100644
--- a/src/private/categories/Categories.jsx
+++ b/src/private/catalogs/categories/Categories.jsx
@@ -7,8 +7,8 @@ import { DataGrid } from '@mui/x-data-grid';
 import EditRoundedIcon from '@mui/icons-material/EditRounded';
 import DeleteRoundedIcon from '@mui/icons-material/DeleteRounded';
 import AddOrEditCategoryForm from './AddOrEditCategoryForm';
-import CategoriesApi from '../../api/CategoriesApi';
-import { useAuth } from '../../context/AuthContext';
+import CategoriesApi from '../../../api/CategoriesApi';
+import { useAuth } from '../../../context/AuthContext';
 
 export default function Categories() {
   const { user } = useAuth();
diff --git a/src/private/catalogs/AddOrEditProductCollectionForm.jsx b/src/private/catalogs/products/AddOrEditProductCollectionForm.jsx
similarity index 98%
rename from src/private/catalogs/AddOrEditProductCollectionForm.jsx
rename to src/private/catalogs/products/AddOrEditProductCollectionForm.jsx
index ae91d1e..372f848 100644
--- a/src/private/catalogs/AddOrEditProductCollectionForm.jsx
+++ b/src/private/catalogs/products/AddOrEditProductCollectionForm.jsx
@@ -1,10 +1,10 @@
 // src/private/furniture/AddOrEditFurnitureVariantForm.jsx
 import { useEffect, useMemo, useState } from 'react';
 import { Box, Button, TextField, MenuItem, Grid, CircularProgress } from '@mui/material';
-import FurnitureVariantApi from '../../api/furnitureVariantApi';
-import CategoriesApi from '../../api/CategoriesApi';
-import TagTypeApi from '../../api/TagTypeApi';
-import { useAuth } from '../../context/AuthContext';
+import FurnitureVariantApi from '../../../api/ProductsApi';
+import CategoriesApi from '../../../api/CategoriesApi';
+import TagTypeApi from '../../../api/TagTypeApi';
+import { useAuth } from '../../../context/AuthContext';
 
 const DEFAULT_MODEL_ID = '8a23117b-acaf-4d87-b64f-a98e9b414796';
 
diff --git a/src/private/catalogs/ProductCollections.jsx b/src/private/catalogs/products/ProductCollections.jsx
similarity index 96%
rename from src/private/catalogs/ProductCollections.jsx
rename to src/private/catalogs/products/ProductCollections.jsx
index 2a34f22..08e18a7 100644
--- a/src/private/catalogs/ProductCollections.jsx
+++ b/src/private/catalogs/products/ProductCollections.jsx
@@ -1,4 +1,4 @@
-import SectionContainer from '../../components/SectionContainer';
+import SectionContainer from '../../../components/SectionContainer';
 import { useEffect, useMemo, useState } from 'react';
 import { DataGrid } from '@mui/x-data-grid';
 import {
@@ -9,11 +9,11 @@ import EditRoundedIcon from '@mui/icons-material/EditRounded';
 import DeleteRoundedIcon from '@mui/icons-material/DeleteRounded';
 import AddRoundedIcon from '@mui/icons-material/AddRounded';
 import AddOrEditProductCollectionForm from './AddOrEditProductCollectionForm';
-import FurnitureVariantApi from '../../api/furnitureVariantApi';
-import CategoriesApi from '../../api/CategoriesApi';
-import TagTypeApi from '../../api/TagTypeApi';
-import { useAuth } from '../../context/AuthContext';
-import useApiToast from '../../hooks/useApiToast';
+import FurnitureVariantApi from '../../../api/ProductsApi';
+import CategoriesApi from '../../../api/CategoriesApi';
+import TagTypeApi from '../../../api/TagTypeApi';
+import { useAuth } from '../../../context/AuthContext';
+import useApiToast from '../../../hooks/useApiToast';
 
 const parsePrice = (p) => {
   if (p == null) return 0;
diff --git a/src/private/clients/AddOrEditClientsForm.jsx b/src/public/clients/AddOrEditClientsForm.jsx
similarity index 100%
rename from src/private/clients/AddOrEditClientsForm.jsx
rename to src/public/clients/AddOrEditClientsForm.jsx
diff --git a/src/private/clients/Clients.jsx b/src/public/clients/Clients.jsx
similarity index 100%
rename from src/private/clients/Clients.jsx
rename to src/public/clients/Clients.jsx
diff --git a/src/private/mongo/AddOrEditAdminForm.jsx b/src/public/mongo/AddOrEditAdminForm.jsx
similarity index 100%
rename from src/private/mongo/AddOrEditAdminForm.jsx
rename to src/public/mongo/AddOrEditAdminForm.jsx
diff --git a/src/private/mongo/Admin.jsx b/src/public/mongo/Admin.jsx
similarity index 100%
rename from src/private/mongo/Admin.jsx
rename to src/public/mongo/Admin.jsx
diff --git a/src/private/products/AddOrEditProductForm.jsx b/src/public/products/AddOrEditProductForm.jsx
similarity index 100%
rename from src/private/products/AddOrEditProductForm.jsx
rename to src/public/products/AddOrEditProductForm.jsx
diff --git a/src/private/products/Products.jsx b/src/public/products/Products.jsx
similarity index 100%
rename from src/private/products/Products.jsx
rename to src/public/products/Products.jsx
diff --git a/src/private/providers/AddOrEditProviderForm.jsx b/src/public/providers/AddOrEditProviderForm.jsx
similarity index 100%
rename from src/private/providers/AddOrEditProviderForm.jsx
rename to src/public/providers/AddOrEditProviderForm.jsx
diff --git a/src/private/providers/Providers.jsx b/src/public/providers/Providers.jsx
similarity index 100%
rename from src/private/providers/Providers.jsx
rename to src/public/providers/Providers.jsx