diff --git a/app/dashboard/finance/budget/page.tsx b/app/dashboard/finance/budget/page.tsx
new file mode 100644
index 0000000..21b7833
--- /dev/null
+++ b/app/dashboard/finance/budget/page.tsx
@@ -0,0 +1,18 @@
+"use client"
+
+import BudgetPortal from "@/components/dashboard/finance/budget";
+
+
+
+
+export default function BudgetPage() {
+  return (
+    
+
+        <div className="p-8 mx-3">
+           <BudgetPortal/>
+        
+        </div>
+   
+  );
+}
\ No newline at end of file
diff --git a/app/dashboard/finance/costinvoice/page.tsx b/app/dashboard/finance/costinvoice/page.tsx
new file mode 100644
index 0000000..41fb177
--- /dev/null
+++ b/app/dashboard/finance/costinvoice/page.tsx
@@ -0,0 +1,18 @@
+"use client"
+
+import CostInvoicePortal from "@/components/dashboard/finance/costInvoice";
+
+
+
+
+export default function CostInvoicePage() {
+  return (
+    
+
+        <div className="p-8 mx-3">
+           <CostInvoicePortal/>
+        
+        </div>
+   
+  );
+}
\ No newline at end of file
diff --git a/app/dashboard/insight/report/page.tsx b/app/dashboard/insight/report/page.tsx
new file mode 100644
index 0000000..65ed667
--- /dev/null
+++ b/app/dashboard/insight/report/page.tsx
@@ -0,0 +1,19 @@
+"use client"
+
+
+import ReportPortal from "@/components/dashboard/insight/reports";
+
+
+
+
+export default function ReportPage() {
+  return (
+    
+
+        <div className="p-8 mx-3">
+           <ReportPortal/>
+        
+        </div>
+   
+  );
+}
\ No newline at end of file
diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx
index 037892c..830652a 100644
--- a/app/dashboard/layout.tsx
+++ b/app/dashboard/layout.tsx
@@ -1,6 +1,6 @@
 "use client"// app/dashboard/layout.tsx
-import Sidebar from "@/utils/sidebar";
-import Navbar from "@/utils/navbar";
+import Sidebar from "@/components/layouts/sidebar";
+import Navbar from "@/components/layouts/navbar";
 import { Sparkles } from "lucide-react";
 
 export default function DashboardLayout({
diff --git a/app/dashboard/operations/energy/page.tsx b/app/dashboard/operations/energy/page.tsx
index 2c21636..9401625 100644
--- a/app/dashboard/operations/energy/page.tsx
+++ b/app/dashboard/operations/energy/page.tsx
@@ -1,9 +1,9 @@
 "use client"
 
-import EnergyPortal from "@/components/dashboard/energy";
+import EnergyPortal from "@/components/dashboard/operations/energy";
 
 
-export default function InventoryPage() {
+export default function EnergyPage() {
   return (
     
 
diff --git a/app/dashboard/operations/equipment/page.tsx b/app/dashboard/operations/equipment/page.tsx
index a985a21..739f342 100644
--- a/app/dashboard/operations/equipment/page.tsx
+++ b/app/dashboard/operations/equipment/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import EquipmentPortal from "@/components/dashboard/equipment"
-export default function HelpDeskPage() {
+import EquipmentPortal from "@/components/dashboard/operations/equipment"
+export default function EquipmentPage() {
   return (
     
 
diff --git a/app/dashboard/operations/helpDesk/page.tsx b/app/dashboard/operations/helpDesk/page.tsx
index b1ca4e4..c2e3d10 100644
--- a/app/dashboard/operations/helpDesk/page.tsx
+++ b/app/dashboard/operations/helpDesk/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import HelpDeskPortal from "@/components/dashboard/helpDesk"
+import HelpDeskPortal from "@/components/dashboard/operations/helpDesk"
 export default function HelpDeskPage() {
   return (
     
diff --git a/app/dashboard/operations/inventory/page.tsx b/app/dashboard/operations/inventory/page.tsx
index b3c5e7a..c4fcaac 100644
--- a/app/dashboard/operations/inventory/page.tsx
+++ b/app/dashboard/operations/inventory/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import InventoryPortal from "@/components/dashboard/inventory";
+import InventoryPortal from "@/components/dashboard/operations/inventory";
 export default function InventoryPage() {
   return (
     
diff --git a/app/dashboard/operations/request/page.tsx b/app/dashboard/operations/request/page.tsx
index 6a0a071..499940f 100644
--- a/app/dashboard/operations/request/page.tsx
+++ b/app/dashboard/operations/request/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import ServiceRequestsPortal from "@/components/dashboard/request"
+import ServiceRequestsPortal from "@/components/dashboard/operations/request"
 export default function ServiceRequestPage() {
   return (
     
diff --git a/app/dashboard/operations/vendorFieldService/page.tsx b/app/dashboard/operations/vendorFieldService/page.tsx
index fdecb65..d554225 100644
--- a/app/dashboard/operations/vendorFieldService/page.tsx
+++ b/app/dashboard/operations/vendorFieldService/page.tsx
@@ -1,9 +1,9 @@
 "use client"
 
-import VendorServicePortal from "@/components/dashboard/vendorService";
+import VendorServicePortal from "@/components/dashboard/operations/vendorService";
 
 
-export default function InventoryPage() {
+export default function VendorPage() {
   return (
     
 
diff --git a/app/dashboard/operations/workPermit/page.tsx b/app/dashboard/operations/workPermit/page.tsx
index cc2c821..de6b021 100644
--- a/app/dashboard/operations/workPermit/page.tsx
+++ b/app/dashboard/operations/workPermit/page.tsx
@@ -1,9 +1,9 @@
 "use client"
 
-import WorkPermitPortal from "@/components/dashboard/workpermit";
+import WorkPermitPortal from "@/components/dashboard/operations/workpermit";
 
 
-export default function InventoryPage() {
+export default function WorkPermitPage() {
   return (
     
 
diff --git a/app/dashboard/overview/buildingOwner/page.tsx b/app/dashboard/overview/buildingOwner/page.tsx
index 3640f80..b7e031c 100644
--- a/app/dashboard/overview/buildingOwner/page.tsx
+++ b/app/dashboard/overview/buildingOwner/page.tsx
@@ -2,10 +2,10 @@
 
 
 
-import BuildingOwnerPortal from "@/components/dashboard/buildingOwner";
+import BuildingOwnerPortal from "@/components/dashboard/overview/buildingOwner";
 
 
-export default function OverViewDashboardPage() {
+export default function BuildingOwnerPage() {
   return (
     
 
diff --git a/app/dashboard/overview/dashboard/page.tsx b/app/dashboard/overview/dashboard/page.tsx
index f434a14..c8d7774 100644
--- a/app/dashboard/overview/dashboard/page.tsx
+++ b/app/dashboard/overview/dashboard/page.tsx
@@ -2,7 +2,7 @@
 
 
 
-import OperationsDashboard from "@/components/dashboard/dashboard";
+import OperationsDashboard from "@/components/dashboard/overview/dashboard";
 
 
 export default function OverViewDashboardPage() {
diff --git a/app/dashboard/overview/engagement/page.tsx b/app/dashboard/overview/engagement/page.tsx
index f5e3b0a..54eea39 100644
--- a/app/dashboard/overview/engagement/page.tsx
+++ b/app/dashboard/overview/engagement/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import EngagementPage from "@/components/dashboard/engagement";
+import EngagementPage from "@/components/dashboard/overview/engagement";
 
 export default function EngagementDashboard() {
   return (
diff --git a/app/dashboard/overview/propertyManager/page.tsx b/app/dashboard/overview/propertyManager/page.tsx
index 6abd0ff..e9a9a96 100644
--- a/app/dashboard/overview/propertyManager/page.tsx
+++ b/app/dashboard/overview/propertyManager/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import PropertyManagerPortal from "@/components/dashboard/propertyManager";
+import PropertyManagerPortal from "@/components/dashboard/overview/propertyManager";
 
-export default function EngagementDashboard() {
+export default function PropertymanagerPage() {
   return (
     
 
diff --git a/app/dashboard/overview/serviceEngineer/page.tsx b/app/dashboard/overview/serviceEngineer/page.tsx
index f0e6cbf..4ef0cf0 100644
--- a/app/dashboard/overview/serviceEngineer/page.tsx
+++ b/app/dashboard/overview/serviceEngineer/page.tsx
@@ -1,8 +1,8 @@
 "use client";
 
-import ServiceEngineerPortal from "@/components/dashboard/serviceEngineer";
+import ServiceEngineerPortal from "@/components/dashboard/overview/serviceEngineer";
 
-export default function EngagementDashboard() {
+export default function ServiceEngineerPage() {
   return (
     
 
diff --git a/app/dashboard/workplace/meetingRoom/page.tsx b/app/dashboard/workplace/meetingRoom/page.tsx
index e69de29..8296ffa 100644
--- a/app/dashboard/workplace/meetingRoom/page.tsx
+++ b/app/dashboard/workplace/meetingRoom/page.tsx
@@ -0,0 +1,17 @@
+"use client"
+
+import MeetingRoomPortal from "@/components/dashboard/workplace/meetingRoom";
+
+
+
+export default function MeetingPage() {
+  return (
+    
+
+        <div className="p-8 mx-3">
+           <MeetingRoomPortal/>
+        
+        </div>
+   
+  );
+}
\ No newline at end of file
diff --git a/app/dashboard/workplace/visitorManagement/page.tsx b/app/dashboard/workplace/visitorManagement/page.tsx
index f530919..8b45f13 100644
--- a/app/dashboard/workplace/visitorManagement/page.tsx
+++ b/app/dashboard/workplace/visitorManagement/page.tsx
@@ -1,9 +1,9 @@
 "use client"
 
-import VistiorManagementPortal from "@/components/dashboard/visitorManagement";
+import VistiorManagementPortal from "@/components/dashboard/workplace/visitorManagement";
 
 
-export default function InventoryPage() {
+export default function VisitorPage() {
   return (
     
 
diff --git a/app/dashboard/workplace/workspace/page.tsx b/app/dashboard/workplace/workspace/page.tsx
index e69de29..e931d05 100644
--- a/app/dashboard/workplace/workspace/page.tsx
+++ b/app/dashboard/workplace/workspace/page.tsx
@@ -0,0 +1,16 @@
+"use client"
+import WorkSpacePortal from "@/components/dashboard/workplace/workspace";
+
+
+
+export default function WorkSpacePage() {
+  return (
+    
+
+        <div className="p-8 mx-3">
+           <WorkSpacePortal/>
+        
+        </div>
+   
+  );
+}
\ No newline at end of file
diff --git a/components/auth/authCard.tsx b/components/auth/authCard.tsx
index 8786261..7d8f71e 100644
--- a/components/auth/authCard.tsx
+++ b/components/auth/authCard.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
 import LoginForm from "./loginForm";
 import VerifyCode from "./verifyCode";
 import ForgotPassword from "./forgetPassword";
-import {Step} from "@/constants/types"
+import {Step} from "@/types/types"
 
 
 
diff --git a/components/auth/authlayout.tsx b/components/auth/authlayout.tsx
index cefed2c..813ece5 100644
--- a/components/auth/authlayout.tsx
+++ b/components/auth/authlayout.tsx
@@ -1,4 +1,4 @@
-import { AuthLayoutProps } from "@/constants/types";
+import { AuthLayoutProps } from "@/types/types";
 import LeftPanel from "./leftpanel";
 
 
diff --git a/utils/badge.tsx b/components/auth/badge.tsx
similarity index 100%
rename from utils/badge.tsx
rename to components/auth/badge.tsx
diff --git a/components/auth/forgetPassword.tsx b/components/auth/forgetPassword.tsx
index e453cd1..2bcb631 100644
--- a/components/auth/forgetPassword.tsx
+++ b/components/auth/forgetPassword.tsx
@@ -1,8 +1,8 @@
-import FormInput from "@/utils/formInput";
-import Button from "@/utils/button";
+import FormInput from "@/components/common/formInput";
+import Button from "@/components/common/button";
 
 
-import {Props} from "@/constants/types"
+import {Props} from "@/types/types"
 
 
 export default function ForgotPassword({ onBack }: Props) {
diff --git a/components/auth/leftpanel.tsx b/components/auth/leftpanel.tsx
index 29eb3be..8f24e52 100644
--- a/components/auth/leftpanel.tsx
+++ b/components/auth/leftpanel.tsx
@@ -1,6 +1,6 @@
 "use client";
-import Badge from "@/utils/badge";
-import Stat from "@/utils/statCard";
+import Badge from "@/components/auth/badge";
+import Stat from "@/components/auth/statCard";
 
 import { ShieldCheck, KeyRound, FileText } from "lucide-react";
 
diff --git a/components/auth/loginForm.tsx b/components/auth/loginForm.tsx
index 4bca565..6a3e2b7 100644
--- a/components/auth/loginForm.tsx
+++ b/components/auth/loginForm.tsx
@@ -1,9 +1,9 @@
 import { Eye,EyeOff } from "lucide-react";
-import FormInput from "@/utils/formInput";
-import Button from "@/utils/button";
+import FormInput from "@/components/common/formInput";
+import Button from "@/components/common/button";
 import { useState } from "react";
 
-import {Props} from "@/constants/types"
+import {Props} from "@/types/types"
 import { signIn } from "next-auth/react";
 
 
diff --git a/utils/statCard.tsx b/components/auth/statCard.tsx
similarity index 100%
rename from utils/statCard.tsx
rename to components/auth/statCard.tsx
diff --git a/components/auth/verifyCode.tsx b/components/auth/verifyCode.tsx
index 2354ad5..d92c6a5 100644
--- a/components/auth/verifyCode.tsx
+++ b/components/auth/verifyCode.tsx
@@ -1,8 +1,8 @@
-import Button from "@/utils/button";
+import Button from "@/components/common/button";
 import OTPInput from "./otpInput";
 import { useEffect, useState, } from "react";
 
-import {Props} from "@/constants/types"
+import {Props} from "@/types/types"
 
 
 export default function VerifyCode({ onBack }: Props) {
diff --git a/utils/barchart.tsx b/components/charts/barchart.tsx
similarity index 91%
rename from utils/barchart.tsx
rename to components/charts/barchart.tsx
index e2109fd..67e3763 100644
--- a/utils/barchart.tsx
+++ b/components/charts/barchart.tsx
@@ -1,11 +1,9 @@
-import {BarChartProps} from "@/constants/types";
+import {BarChartProps} from "@/types/types";
 
 
 
 export default function BarChart({ data }: BarChartProps) {
-  return (
-   
-     
+  return (   
 
       <div>
         {/* Bars */}
diff --git a/utils/progressBarRow.tsx b/components/charts/progressBarRow.tsx
similarity index 92%
rename from utils/progressBarRow.tsx
rename to components/charts/progressBarRow.tsx
index d01bc05..edb12ee 100644
--- a/utils/progressBarRow.tsx
+++ b/components/charts/progressBarRow.tsx
@@ -1,5 +1,5 @@
 
-import { ProgressBarProps } from "@/constants/types";
+import { ProgressBarProps } from "@/types/types";
 export function ProgressBarRow({ label, value, maxValue }: ProgressBarProps) {
   const percentage = (value / maxValue) * 100;
 
diff --git a/utils/statusProgressRow.tsx b/components/charts/statusProgressRow.tsx
similarity index 92%
rename from utils/statusProgressRow.tsx
rename to components/charts/statusProgressRow.tsx
index 79f92bb..4652521 100644
--- a/utils/statusProgressRow.tsx
+++ b/components/charts/statusProgressRow.tsx
@@ -1,5 +1,5 @@
 
-import { StatusProgressProps } from "@/constants/types";
+import { StatusProgressProps } from "@/types/types";
 
 export function StatusProgressRow({ label, value, total, barColor = "bg-[#17cbb5]" }: StatusProgressProps) {
   const percentage = (value / total) * 100;
diff --git a/utils/button.tsx b/components/common/button.tsx
similarity index 79%
rename from utils/button.tsx
rename to components/common/button.tsx
index dd22ded..2b4f548 100644
--- a/utils/button.tsx
+++ b/components/common/button.tsx
@@ -1,4 +1,4 @@
-import { ButtonProps } from "@/constants/types";
+import { ButtonProps } from "@/types/types";
 
 
 export default function Button({
diff --git a/utils/cardHeader.tsx b/components/common/cardHeader.tsx
similarity index 100%
rename from utils/cardHeader.tsx
rename to components/common/cardHeader.tsx
diff --git a/utils/cardWrapper.tsx b/components/common/cardWrapper.tsx
similarity index 100%
rename from utils/cardWrapper.tsx
rename to components/common/cardWrapper.tsx
diff --git a/utils/dashStatCard.tsx b/components/common/dashStatCard.tsx
similarity index 97%
rename from utils/dashStatCard.tsx
rename to components/common/dashStatCard.tsx
index 7c42d35..9c48f61 100644
--- a/utils/dashStatCard.tsx
+++ b/components/common/dashStatCard.tsx
@@ -1,4 +1,4 @@
-import { StatCardProps } from "@/constants/types";
+import { StatCardProps } from "@/types/types";
 import { colorMap } from "@/constants/constant";
 
 export default function StatCard({
diff --git a/utils/dataTable.tsx b/components/common/dataTable.tsx
similarity index 100%
rename from utils/dataTable.tsx
rename to components/common/dataTable.tsx
diff --git a/utils/formInput.tsx b/components/common/formInput.tsx
similarity index 90%
rename from utils/formInput.tsx
rename to components/common/formInput.tsx
index 1e52d19..11b6d15 100644
--- a/utils/formInput.tsx
+++ b/components/common/formInput.tsx
@@ -1,5 +1,5 @@
 
-import { FormProps } from "@/constants/types";
+import { FormProps } from "@/types/types";
 export default function FormInput({
   label,
   value,
diff --git a/utils/infoBanner.tsx b/components/common/infoBanner.tsx
similarity index 90%
rename from utils/infoBanner.tsx
rename to components/common/infoBanner.tsx
index 64e4fa7..8450854 100644
--- a/utils/infoBanner.tsx
+++ b/components/common/infoBanner.tsx
@@ -1,6 +1,6 @@
 
 
-import {InfoBannerProps} from "@/constants/types";
+import {InfoBannerProps} from "@/types/types";
 
 export default function InfoBanner({ 
   boldText, 
diff --git a/utils/roundedFilters.tsx b/components/common/roundedFilters.tsx
similarity index 96%
rename from utils/roundedFilters.tsx
rename to components/common/roundedFilters.tsx
index 1e7d1d2..5d67f4a 100644
--- a/utils/roundedFilters.tsx
+++ b/components/common/roundedFilters.tsx
@@ -1,4 +1,4 @@
-import { FilterTabsProps } from "@/constants/types";
+import { FilterTabsProps } from "@/types/types";
 
 export default function FilterTabs({
   options = [],
diff --git a/utils/tabs.tsx b/components/common/tabs.tsx
similarity index 92%
rename from utils/tabs.tsx
rename to components/common/tabs.tsx
index 112bdd1..4a3ab4c 100644
--- a/utils/tabs.tsx
+++ b/components/common/tabs.tsx
@@ -1,4 +1,4 @@
-import { NavigationTabsProps } from "@/constants/types";
+import { NavigationTabsProps } from "@/types/types";
 
 
 
diff --git a/components/dashboard/finance/budget.tsx b/components/dashboard/finance/budget.tsx
new file mode 100644
index 0000000..6a64f51
--- /dev/null
+++ b/components/dashboard/finance/budget.tsx
@@ -0,0 +1,201 @@
+import {
+  Database,
+  FileText,
+  Activity,
+  AlertTriangle,
+  Plus
+} from "lucide-react";
+
+import InfoBanner from "@/components/common/infoBanner";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import { Card } from '@/components/common/cardWrapper';
+import { CardHeader } from '@/components/common/cardHeader';
+import { approvalQueueData, categoryData } from "@/constants/constant";
+
+
+
+export default function BudgetPortal() {
+  return (
+    <div className="my-15 text-slate-100 font-sans">
+      {/* --- HEADER SECTION WITH BUTTONS --- */}
+      <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-6">
+        <div>
+          <div className="flex items-center gap-2 text-[10px] font-bold tracking-widest text-slate-500 uppercase font-mono">
+            <span className="text-teal-400">Apple One — HQ Tower</span>
+            <span>•</span>
+            <span>FINANCE</span>
+            <span>•</span>
+            <span>O&M BUDGET</span>
+          </div>
+
+          <h1 className="text-2xl font-bold text-white tracking-tight mt-2">
+            O&M budget management
+          </h1>
+
+          <p className="text-sm font-medium text-slate-400 mt-2 max-w-xl leading-relaxed">
+            Multi-dimensional budgets by site, department and asset — planned vs actual, variance, approvals and overrun alerts.
+          </p>
+        </div>
+
+        {/* --- HEADER BUTTONS --- */}
+        <div className="flex items-center gap-2.5 self-start md:mt-6">
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-4 py-2 rounded-lg font-semibold transition-colors">
+            <span>Export</span>
+          </Button>
+
+          <Button className="bg-teal-400 hover:bg-teal-300 text-slate-950 font-bold text-xs px-4 py-2 rounded-lg flex items-center gap-1.5 transition-colors">
+            <Plus className="w-4 h-4 stroke-[3]" />
+            <span>New budget</span>
+          </Button>
+        </div>
+      </div>
+
+      {/* --- STAT CARDS --- */}
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+        {/* Annual budget */}
+        <StatCard
+          variant="icon"
+          title="Annual budget"
+          value="₹1.91 Cr"
+          icon={Database}
+          badgeText="FY 2026"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-blue-950/40 border-blue-800/30 text-blue-400"
+        />
+
+        {/* Spent YTD */}
+        <StatCard
+          variant="icon"
+          title="Spent YTD"
+          value="₹1.42 Cr"
+          icon={FileText}
+          badgeText="74% used"
+          badgeClassName="text-emerald-400 lowercase font-mono"
+          iconContainerClassName="bg-emerald-950/40 border-emerald-800/30 text-emerald-400"
+        />
+
+        {/* Remaining */}
+        <StatCard
+          variant="icon"
+          title="Remaining"
+          value="₹49.0 L"
+          icon={Activity}
+          badgeText="26% left"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-amber-950/40 border-amber-800/30 text-amber-400"
+        />
+
+        {/* Overrun lines */}
+        <StatCard
+          variant="icon"
+          title="Overrun lines"
+          value="1"
+          icon={AlertTriangle}
+          badgeText="review"
+          badgeClassName="text-rose-400 lowercase font-mono"
+          iconContainerClassName="bg-rose-950/40 border-rose-900/30 text-rose-400"
+        />
+      </div>
+
+      {/* --- BUDGET DETAILS & APPROVAL QUEUE SECTION --- */}
+      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-8">
+        {/* Planned vs Actual Table (Left 2 Columns) */}
+        <Card className="lg:col-span-2 justify-start">
+          <CardHeader 
+            title="Planned vs actual · by category" 
+            subtitle="CAPEX ₹35.0 L • OPEX ₹1.56 Cr" 
+          />
+
+          <div className="overflow-x-auto mt-2">
+            <table className="w-full text-left border-collapse">
+              <thead>
+                <tr className="border-b border-[#162942]/60 text-[11px] font-mono font-bold text-slate-500 uppercase tracking-wider">
+                  <th className="py-2.5 px-2">Category</th>
+                  <th className="py-2.5 px-2">Type</th>
+                  <th className="py-2.5 px-2 font-mono">Planned</th>
+                  <th className="py-2.5 px-2 font-mono">Actual</th>
+                  <th className="py-2.5 px-2 font-mono">Variance</th>
+                  <th className="py-2.5 px-2 font-mono min-w-[120px]">Utilization</th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-[#162942]/40 text-xs">
+                {categoryData.map((row, idx) => (
+                  <tr key={idx} className="hover:bg-slate-900/30 transition-colors">
+                    <td className="py-3 px-2 font-semibold text-slate-100">
+                      {row.category}
+                    </td>
+                    <td className="py-3 px-2">
+                      <span className="bg-[#12233a] border border-[#1d3554] text-slate-300 font-mono text-[10px] px-2 py-0.5 rounded">
+                        {row.type}
+                      </span>
+                    </td>
+                    <td className="py-3 px-2 font-mono text-slate-300">
+                      {row.planned}
+                    </td>
+                    <td className="py-3 px-2 font-mono text-slate-300">
+                      {row.actual}
+                    </td>
+                    <td className={`py-3 px-2 font-mono font-semibold ${row.varianceColor}`}>
+                      {row.variance}
+                    </td>
+                    <td className="py-3 px-2">
+                      <div className="w-full bg-[#12233a] h-1.5 rounded-full overflow-hidden mb-1">
+                        <div
+                          className={`h-full ${row.barColor}`}
+                          style={{ width: `${Math.min(row.utilization, 100)}%` }}
+                        />
+                      </div>
+                      <span className="text-[10px] font-mono text-slate-400">
+                        {row.utilization}%
+                      </span>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </Card>
+
+        {/* Approval Queue Panel (Right 1 Column) */}
+        <Card className="justify-start">
+          <CardHeader title="Approval queue" subtitle="multi-level" />
+
+          <div className="divide-y divide-[#162942]/60 mt-1">
+            {approvalQueueData.map((item) => (
+              <div key={item.id} className="py-3.5 flex items-center justify-between gap-3">
+                <div>
+                  <h4 className="text-xs font-semibold text-white leading-snug">
+                    {item.title}
+                  </h4>
+                  <p className="text-[11px] font-mono text-slate-500 mt-1">
+                    {item.id} · {item.meta}
+                  </p>
+                </div>
+
+                {item.status === "pending" ? (
+                  <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-200 text-xs font-semibold px-3 py-1 rounded transition-colors whitespace-nowrap">
+                    Approve
+                  </button>
+                ) : (
+                  <span className="flex items-center gap-1.5 bg-emerald-950/40 border border-emerald-800/30 text-emerald-400 text-[10px] font-mono font-bold px-2.5 py-1 rounded-full whitespace-nowrap">
+                    <span className="w-1.5 h-1.5 rounded-full bg-emerald-400" />
+                    COMPLETED
+                  </span>
+                )}
+              </div>
+            ))}
+          </div>
+        </Card>
+      </div>
+
+      {/* Info Banner */}
+      <div className="my-8">
+        <InfoBanner
+          boldText="Utilization %"
+          normalText=" per category = Actual ÷ Planned × 100 (the bar turns amber past 90%, red on overrun); categories & types are configured in Master Data → Finance. Integration: budget lines link to work orders, purchase orders and vendor invoices — actuals post back automatically and overruns raise an alert to the approver."
+        />
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/dashboard/finance/costInvoice.tsx b/components/dashboard/finance/costInvoice.tsx
new file mode 100644
index 0000000..b1024e9
--- /dev/null
+++ b/components/dashboard/finance/costInvoice.tsx
@@ -0,0 +1,298 @@
+import {
+  FileText,
+  Database,
+  AlertTriangle,
+  Activity,
+  Sparkles,
+  Plus
+} from "lucide-react";
+
+import InfoBanner from "@/components/common/infoBanner";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import Table from "@/components/common/dataTable";
+
+const StatusBadge = ({
+  text,
+  color,
+}: {
+  text: string;
+  color: string;
+}) => (
+  <span
+    className={`inline-flex items-center gap-1 rounded-full px-3 py-1 text-[10px] font-semibold uppercase tracking-wider whitespace-nowrap ${color}`}
+  >
+    <span className="h-1.5 w-1.5 rounded-full bg-current" />
+    {text}
+  </span>
+);
+
+const ActionButton = ({ text }: { text: string }) => (
+  <Button className="rounded-lg border border-slate-700/60 bg-[#16243a] px-3 py-1.5 text-sm font-semibold text-slate-300 hover:bg-slate-700 transition">
+    {text}
+  </Button>
+);
+
+const headers = [
+  "Invoice",
+  "Client",
+  "Period",
+  "Amount",
+  "Raised",
+  "Due",
+  "Status",
+  "",
+];
+
+const rows = [
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9040</span>,
+    <span className="font-semibold text-slate-100">Apple One Corp</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹12.4 L</span>,
+    <span className="font-mono">Jun 5, 2026</span>,
+    <span className="font-mono">Jul 5, 2026</span>,
+    <StatusBadge
+      text="Paid"
+      color="bg-emerald-500/15 text-emerald-400"
+    />,
+    <span className="text-slate-500">—</span>,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9041</span>,
+    <span className="font-semibold text-slate-100">Novotel F&B</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹8.6 L</span>,
+    <span className="font-mono">Jun 9, 2026</span>,
+    <span className="font-mono">Jul 9, 2026</span>,
+    <StatusBadge
+      text="Sent"
+      color="bg-amber-500/15 text-amber-400"
+    />,
+    <ActionButton text="Mark paid" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9042</span>,
+    <span className="font-semibold text-slate-100">SRM Estates</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹4.3 L</span>,
+    <span className="font-mono">Jun 13, 2026</span>,
+    <span className="font-mono">Jul 13, 2026</span>,
+    <StatusBadge
+      text="Overdue"
+      color="bg-red-500/15 text-red-400"
+    />,
+    <ActionButton text="Mark paid" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9043</span>,
+    <span className="font-semibold text-slate-100">Local Mart</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹21.0 L</span>,
+    <span className="font-mono">Jun 17, 2026</span>,
+    <span className="font-mono">Jul 17, 2026</span>,
+    <StatusBadge
+      text="Paid"
+      color="bg-emerald-500/15 text-emerald-400"
+    />,
+    <span className="text-slate-500">—</span>,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9044</span>,
+    <span className="font-semibold text-slate-100">Regus Spaces</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹6.8 L</span>,
+    <span className="font-mono">Jun 21, 2026</span>,
+    <span className="font-mono">Jul 21, 2026</span>,
+    <StatusBadge
+      text="Draft"
+      color="bg-slate-700/60 text-slate-400"
+    />,
+    <ActionButton text="Send" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9105</span>,
+    <span className="font-semibold text-slate-100">Apple One Corp</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹12.4 L</span>,
+    <span className="font-mono">Jun 5, 2026</span>,
+    <span className="font-mono">Jul 5, 2026</span>,
+    <StatusBadge
+      text="Sent"
+      color="bg-amber-500/15 text-amber-400"
+    />,
+    <ActionButton text="Mark paid" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9106</span>,
+    <span className="font-semibold text-slate-100">Novotel F&B</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹8.6 L</span>,
+    <span className="font-mono">Jun 9, 2026</span>,
+    <span className="font-mono">Jul 9, 2026</span>,
+    <StatusBadge
+      text="Draft"
+      color="bg-slate-700/60 text-slate-400"
+    />,
+    <ActionButton text="Send" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9107</span>,
+    <span className="font-semibold text-slate-100">SRM Estates</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹4.3 L</span>,
+    <span className="font-mono">Jun 13, 2026</span>,
+    <span className="font-mono">Jul 13, 2026</span>,
+    <StatusBadge
+      text="Draft"
+      color="bg-slate-700/60 text-slate-400"
+    />,
+    <ActionButton text="Send" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9108</span>,
+    <span className="font-semibold text-slate-100">Local Mart</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹21.0 L</span>,
+    <span className="font-mono">Jun 17, 2026</span>,
+    <span className="font-mono">Jul 17, 2026</span>,
+    <StatusBadge
+      text="Paid"
+      color="bg-emerald-500/15 text-emerald-400"
+    />,
+    <span className="text-slate-500">—</span>,
+  ],
+   [
+    <span className="font-semibold text-[#2EE6C5]">INV-9107</span>,
+    <span className="font-semibold text-slate-100">SRM Estates</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹4.3 L</span>,
+    <span className="font-mono">Jun 13, 2026</span>,
+    <span className="font-mono">Jul 13, 2026</span>,
+    <StatusBadge
+      text="Draft"
+      color="bg-slate-700/60 text-slate-400"
+    />,
+    <ActionButton text="Send" />,
+  ],
+
+  [
+    <span className="font-semibold text-[#2EE6C5]">INV-9108</span>,
+    <span className="font-semibold text-slate-100">Local Mart</span>,
+    "Jun 2026",
+    <span className="font-semibold">₹21.0 L</span>,
+    <span className="font-mono">Jun 17, 2026</span>,
+    <span className="font-mono">Jul 17, 2026</span>,
+    <StatusBadge
+      text="Paid"
+      color="bg-emerald-500/15 text-emerald-400"
+    />,
+    <span className="text-slate-500">—</span>,
+  ],
+];
+export default function CostInvoicePortal() {
+  return (
+    <div className="my-15 text-slate-100 font-sans">
+      {/* --- HEADER SECTION WITH BUTTONS --- */}
+      <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-6">
+        <div>
+          <div className="flex items-center gap-2 text-[10px] font-bold tracking-widest text-slate-500 uppercase font-mono">
+            <span className="text-teal-400">Apple One — HQ Tower</span>
+            <span>•</span>
+            <span>FINANCE</span>
+            <span>•</span>
+            <span>COSTING & INVOICING</span>
+          </div>
+
+          <h1 className="text-2xl font-bold text-white tracking-tight mt-2">
+            Client costing & auto-invoicing
+          </h1>
+
+          <p className="text-sm font-medium text-slate-400 mt-2 max-w-xl leading-relaxed">
+            Client-wise costing setup, automatic project approval and invoice generation — fully native, no external dependency.
+          </p>
+        </div>
+
+        {/* --- HEADER BUTTONS --- */}
+        <div className="flex items-center gap-2.5 self-start md:mt-6">
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-3.5 py-2 rounded-lg flex items-center gap-2 font-semibold transition-colors">
+            <Sparkles className="w-4 h-4 text-slate-300" />
+            <span>Costing rules</span>
+          </Button>
+
+          <Button className="bg-teal-400 hover:bg-teal-300 text-slate-950 font-bold text-xs px-4 py-2 rounded-lg flex items-center gap-1.5 transition-colors">
+            <Plus className="w-4 h-4 stroke-[3]" />
+            <span>Generate invoice</span>
+          </Button>
+        </div>
+      </div>
+
+      {/* --- STAT CARDS --- */}
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+        {/* Billed */}
+        <StatCard
+          variant="icon"
+          title="Billed"
+          value="₹99.4 L"
+          icon={FileText}
+          badgeText="this month"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-blue-950/40 border-blue-800/30 text-blue-400"
+        />
+
+        {/* Outstanding */}
+        <StatCard
+          variant="icon"
+          title="Outstanding"
+          value="₹45.0 L"
+          icon={Database}
+          badgeText="receivable"
+          badgeClassName="text-amber-400 lowercase font-mono"
+          iconContainerClassName="bg-amber-950/40 border-amber-800/30 text-amber-400"
+        />
+
+        {/* Overdue */}
+        <StatCard
+          variant="icon"
+          title="Overdue"
+          value="₹4.3 L"
+          icon={AlertTriangle}
+          badgeText="follow up"
+          badgeClassName="text-rose-400 lowercase font-mono"
+          iconContainerClassName="bg-rose-950/40 border-rose-900/30 text-rose-400"
+          
+        />
+
+        {/* Collection rate */}
+        <StatCard
+          variant="icon"
+          title="Collection rate"
+          value="55%"
+          icon={Activity}
+          badgeText="MTD"
+          badgeClassName="text-slate-400 font-mono uppercase"
+          iconContainerClassName="bg-emerald-950/40 border-emerald-800/30 text-emerald-400"
+        />
+      </div>
+
+<div className="mt-5">
+    <Table headers={headers} rows={rows}/>
+</div>
+      {/* Info Banner */}
+      <div className="my-8">
+        <InfoBanner
+          boldText="Auto-invoicing:"
+          normalText=" completed work orders and AMC visits roll up into client costing by contract rate → invoice drafts are generated, approved, and dispatched without manual re-entry."
+        />
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/dashboard/insight/reports.tsx b/components/dashboard/insight/reports.tsx
new file mode 100644
index 0000000..062ab80
--- /dev/null
+++ b/components/dashboard/insight/reports.tsx
@@ -0,0 +1,182 @@
+import { useState } from 'react';
+import { Plus, Download } from 'lucide-react';
+import Button from "@/components/common/button";
+import NavigationTabs from '@/components/common/tabs';
+import { reportFilters, reporttabs, Reqeusttabs, statusFilters } from '@/constants/constant';
+import FilterTabs from '@/components/common/roundedFilters';
+import Table from '@/components/common/dataTable';
+
+
+const StatusBadge = ({
+  text,
+  color,
+}: {
+  text: string;
+  color: string;
+}) => (
+  <span
+    className={`inline-flex items-center gap-1 rounded-full px-3 py-1 text-[10px] font-semibold uppercase tracking-wider whitespace-nowrap ${color}`}
+  >
+    <span className="h-1.5 w-1.5 rounded-full bg-current" />
+    {text}
+  </span>
+);
+
+const headers = [
+  "Code",
+  "Equipment",
+  "Group",
+  "Block · Floor",
+  "Service Provider",
+  "Manufacturer",
+  "Model",
+];
+
+const rows = [
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1100</span>,
+    <span className="font-semibold whitespace-nowrap">Cooling Tower</span>,
+    "Electrical",
+    "Block 1 · 2",
+    "Blue Star",
+    "Kirloskar",
+    <span className="font-mono text-slate-400">M-550</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1103</span>,
+    <span className="font-semibold whitespace-nowrap">Air Handling Unit</span>,
+    "Plumbing",
+    "Tower A · 1",
+    "Blue Star",
+    "Voltas",
+    <span className="font-mono text-slate-400">M-550</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1106</span>,
+    <span className="font-semibold whitespace-nowrap">VRV Outdoor</span>,
+    "Electrical",
+    "Tower A · G",
+    "Voltas",
+    "Daikin",
+    <span className="font-mono text-slate-400">M-320</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1109</span>,
+    <span className="font-semibold whitespace-nowrap">VRV Outdoor</span>,
+    "HVAC",
+    "Tower A · 1",
+    "Voltas",
+    "Blue Star",
+    <span className="font-mono text-slate-400">M-320</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1112</span>,
+    <span className="font-semibold whitespace-nowrap">Air Handling Unit</span>,
+    "HVAC",
+    "Tower A · G",
+    "In-house",
+    "Voltas",
+    <span className="font-mono text-slate-400">M-550</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1115</span>,
+    <span className="font-semibold whitespace-nowrap">Air Handling Unit</span>,
+    "Electrical",
+    "Tower A · 2",
+    "Voltas",
+    "Daikin",
+    <span className="font-mono text-slate-400">M-XR9</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1118</span>,
+    <span className="font-semibold whitespace-nowrap">Chiller</span>,
+    "Electrical",
+    "Block 1 · 1",
+    "In-house",
+    "Blue Star",
+    <span className="font-mono text-slate-400">M-XR9</span>,
+  ],
+
+  [
+    <span className="font-semibold text-teal-400 whitespace-nowrap">APP-1121</span>,
+    <span className="font-semibold whitespace-nowrap">Cooling Tower</span>,
+    "Plumbing",
+    "Tower A · 1",
+    "Blue Star",
+    "Daikin",
+    <span className="font-mono text-slate-400">M-550</span>,
+  ],
+];
+
+export default function ReportPortal() {
+  const [activeTab, setActiveTab] = useState<string>('Equipment');
+  const [activeFilter, setActiveFilter] = useState<string>('Site All');
+
+  const handleDownload = () => {
+    // Add your export/download logic here
+    console.log("Downloading report...");
+  };
+
+  return (
+    <div className="my-15 text-slate-100 font-sans">
+      {/* --- HEADER SECTION --- */}
+      <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-6">
+        <div>
+          <div className="flex items-center gap-2 text-[10px] font-bold tracking-widest text-slate-500 uppercase font-mono">
+            <span className="text-teal-400">Apple One — HQ Tower</span>
+            <span>•</span>
+            <span>INSIGHT</span>
+            <span>•</span>
+            <span>REPORTS</span>
+          </div>
+          <h1 className="text-2xl font-bold text-white tracking-tight mt-2">
+            Reports & MMR
+          </h1>
+          <p className="text-sm font-medium text-slate-400 mt-2 max-w-xl leading-relaxed">
+           A read-only layer over every module — filter, visualise, and export. Never on the write path.
+          </p>
+        </div>
+      </div>
+
+      {/* --- NAVIGATION TABS & TOP ACTION BUTTONS --- */}
+      <div className="flex flex-col 
+      md:flex-row md:items-center justify-between 
+      border-b border-slate-800/80 mb-4 gap-4">
+        {/* Navigation Tabs */}
+        <NavigationTabs
+          tabs={reporttabs}
+          activeTab={activeTab}
+          onTabChange={setActiveTab}
+          className="mb-6"
+        />
+      </div>
+
+      {/* --- STATUS PILL FILTERS & DOWNLOAD BUTTON --- */}
+      <div className="flex items-center justify-between gap-4">
+        <FilterTabs
+          options={reportFilters}
+          activeFilter={activeFilter}
+          onChange={setActiveFilter}
+        />
+
+        <button
+          onClick={handleDownload}
+          className="inline-flex items-center gap-2 rounded-xl bg-teal-400 px-5 py-2.5 text-sm font-semibold text-slate-950 hover:bg-teal-300 transition-colors focus:outline-none focus:ring-2 focus:ring-teal-400/50 shrink-0"
+        >
+          Download
+        </button>
+      </div>
+
+      <div className='mt-5'>
+        <Table headers={headers} rows={rows}/>
+      </div>
+      
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/dashboard/energy.tsx b/components/dashboard/operations/energy.tsx
similarity index 98%
rename from components/dashboard/energy.tsx
rename to components/dashboard/operations/energy.tsx
index c38f502..09d02a0 100644
--- a/components/dashboard/energy.tsx
+++ b/components/dashboard/operations/energy.tsx
@@ -6,8 +6,8 @@ import {
   LayoutGrid, 
   Plus 
 } from "lucide-react";
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
 
 
 
diff --git a/components/dashboard/equipment.tsx b/components/dashboard/operations/equipment.tsx
similarity index 74%
rename from components/dashboard/equipment.tsx
rename to components/dashboard/operations/equipment.tsx
index 8ed2d71..31ce795 100644
--- a/components/dashboard/equipment.tsx
+++ b/components/dashboard/operations/equipment.tsx
@@ -12,12 +12,13 @@ import {
   LayoutGrid,
 } from "lucide-react";
 
-import Table from "@/utils/dataTable";
-import InfoBanner from "@/utils/infoBanner";
-import Button from "@/utils/button";
-import NavigationTabs from "@/utils/tabs";
+import Table from "@/components/common/dataTable";
+import InfoBanner from "@/components/common/infoBanner";
+import Button from "@/components/common/button";
+import NavigationTabs from "@/components/common/tabs";
 import { equipmentTabs } from "@/constants/constant";
 import { useState } from "react";
+import StatCard from "@/components/common/dashStatCard";
 
 const headers = [
   "Code",
@@ -189,64 +190,51 @@ export default function EquipmentPortal() {
         className="mb-6"
       />
 
-      {/* --- STAT CARDS (4 CARDS MATCHING SCREENSHOT) --- */}
       <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
-        {/* Total equipment */}
-        <div className="bg-[#0b1727] border border-teal-500/50 rounded-xl p-4 flex flex-col justify-between relative shadow-lg">
-          <div className="flex items-center justify-between">
-            <div className="p-2.5 rounded-lg bg-teal-950/60 border border-teal-800/40 text-teal-400">
-              <Target size={18} />
-            </div>
-            <span className="text-xs font-mono text-slate-400">4 groups</span>
-          </div>
-          <div className="mt-4">
-            <div className="text-3xl font-bold text-white tracking-tight">8</div>
-            <div className="text-xs text-slate-400 mt-1 font-medium">Total equipment</div>
-          </div>
-        </div>
+  {/* Total equipment */}
+  <StatCard
+    variant="icon"
+    title="Total equipment"
+    value="8"
+    icon={Target}
+    badgeText="4 groups"
+    badgeClassName="text-slate-400 font-mono"
+    iconContainerClassName="bg-teal-950/60 border-teal-800/40 text-teal-400"
+  />
 
-        {/* Critical assets */}
-        <div className="bg-[#0b1727] border border-slate-800/80 rounded-xl p-4 flex flex-col justify-between relative">
-          <div className="flex items-center justify-between">
-            <div className="p-2.5 rounded-lg bg-rose-950/50 border border-rose-800/40 text-rose-400">
-              <AlertTriangle size={18} />
-            </div>
-            <span className="text-xs font-mono text-rose-400 font-semibold">priority</span>
-          </div>
-          <div className="mt-4">
-            <div className="text-3xl font-bold text-white tracking-tight">4</div>
-            <div className="text-xs text-slate-400 mt-1 font-medium">Critical assets</div>
-          </div>
-        </div>
+  {/* Critical assets */}
+  <StatCard
+    variant="icon"
+    title="Critical assets"
+    value="4"
+    icon={AlertTriangle}
+    badgeText="priority"
+    badgeClassName="text-rose-400 font-semibold font-mono"
+    iconContainerClassName="bg-rose-950/50 border-rose-800/40 text-rose-400"
+  />
 
-        {/* PPM attention */}
-        <div className="bg-[#0b1727] border border-slate-800/80 rounded-xl p-4 flex flex-col justify-between relative">
-          <div className="flex items-center justify-between">
-            <div className="p-2.5 rounded-lg bg-amber-950/50 border border-amber-800/40 text-amber-400">
-              <Clock size={18} />
-            </div>
-            <span className="text-xs font-mono text-amber-400 font-semibold">due / overdue</span>
-          </div>
-          <div className="mt-4">
-            <div className="text-3xl font-bold text-white tracking-tight">3</div>
-            <div className="text-xs text-slate-400 mt-1 font-medium">PPM attention</div>
-          </div>
-        </div>
+  {/* PPM attention */}
+  <StatCard
+    variant="icon"
+    title="PPM attention"
+    value="3"
+    icon={Clock}
+    badgeText="due / overdue"
+    badgeClassName="text-amber-400 font-semibold font-mono"
+    iconContainerClassName="bg-amber-950/50 border-amber-800/40 text-amber-400"
+  />
 
-        {/* On plan */}
-        <div className="bg-[#0b1727] border border-slate-800/80 rounded-xl p-4 flex flex-col justify-between relative">
-          <div className="flex items-center justify-between">
-            <div className="p-2.5 rounded-lg bg-emerald-950/50 border border-emerald-800/40 text-emerald-400">
-              <ShieldCheck size={18} />
-            </div>
-            <span className="text-xs font-mono text-emerald-400 font-semibold">healthy</span>
-          </div>
-          <div className="mt-4">
-            <div className="text-3xl font-bold text-white tracking-tight">5</div>
-            <div className="text-xs text-slate-400 mt-1 font-medium">On plan</div>
-          </div>
-        </div>
-      </div>
+  {/* On plan */}
+  <StatCard
+    variant="icon"
+    title="On plan"
+    value="5"
+    icon={ShieldCheck}
+    badgeText="healthy"
+    badgeClassName="text-emerald-400 font-semibold font-mono"
+    iconContainerClassName="bg-emerald-950/50 border-emerald-800/40 text-emerald-400"
+  />
+</div>
 
       {/* --- ROW 2: SEARCH, FILTERS & ACTION BUTTONS --- */}
       <div className="flex flex-col md:flex-row items-center justify-between gap-3 mb-6">
diff --git a/components/dashboard/helpDesk.tsx b/components/dashboard/operations/helpDesk.tsx
similarity index 98%
rename from components/dashboard/helpDesk.tsx
rename to components/dashboard/operations/helpDesk.tsx
index e5dc16d..9a2fb7d 100644
--- a/components/dashboard/helpDesk.tsx
+++ b/components/dashboard/operations/helpDesk.tsx
@@ -11,10 +11,10 @@ import {
   Pencil,
   Plus, 
 } from 'lucide-react';
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import Table from "@/utils/dataTable";
-import NavigationTabs from '@/utils/tabs';
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import Table from "@/components/common/dataTable";
+import NavigationTabs from '@/components/common/tabs';
 import { helpdeskTtabs } from '@/constants/constant';
 
 const StatusBadge = ({
diff --git a/components/dashboard/inventory.tsx b/components/dashboard/operations/inventory.tsx
similarity index 98%
rename from components/dashboard/inventory.tsx
rename to components/dashboard/operations/inventory.tsx
index bb72548..f8c22a1 100644
--- a/components/dashboard/inventory.tsx
+++ b/components/dashboard/operations/inventory.tsx
@@ -6,9 +6,9 @@ import {
   LayoutGrid, 
   Plus 
 } from "lucide-react";
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import InfoBanner from "@/utils/infoBanner";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import InfoBanner from "@/components/common/infoBanner";
 
 
 
diff --git a/components/dashboard/request.tsx b/components/dashboard/operations/request.tsx
similarity index 96%
rename from components/dashboard/request.tsx
rename to components/dashboard/operations/request.tsx
index 24230fb..4d13498 100644
--- a/components/dashboard/request.tsx
+++ b/components/dashboard/operations/request.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react';
 import { Plus } from 'lucide-react';
-import Button from "@/utils/button";
-import LocationTable from '@/utils/dataTable';
-import NavigationTabs from '@/utils/tabs';
+import Button from "@/components/common/button";
+import LocationTable from '@/components/common/dataTable';
+import NavigationTabs from '@/components/common/tabs';
 import { Reqeusttabs,statusFilters } from '@/constants/constant';
-import FilterTabs from '@/utils/roundedFilters';
-import Table from '@/utils/dataTable';
+import FilterTabs from '@/components/common/roundedFilters';
+import Table from '@/components/common/dataTable';
 
 
 const StatusBadge = ({
diff --git a/components/dashboard/vendorService.tsx b/components/dashboard/operations/vendorService.tsx
similarity index 98%
rename from components/dashboard/vendorService.tsx
rename to components/dashboard/operations/vendorService.tsx
index 3fe9087..a5ee5f3 100644
--- a/components/dashboard/vendorService.tsx
+++ b/components/dashboard/operations/vendorService.tsx
@@ -7,9 +7,9 @@ import {
   BarChart2, 
   Plus 
 } from "lucide-react";
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import InfoBanner from "@/utils/infoBanner";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import InfoBanner from "@/components/common/infoBanner";
 
 export default function VendorServicePortal() {
   const vendorData = [
diff --git a/components/dashboard/workpermit.tsx b/components/dashboard/operations/workpermit.tsx
similarity index 98%
rename from components/dashboard/workpermit.tsx
rename to components/dashboard/operations/workpermit.tsx
index f402ea8..2a2bde7 100644
--- a/components/dashboard/workpermit.tsx
+++ b/components/dashboard/operations/workpermit.tsx
@@ -1,13 +1,13 @@
 import { useState } from 'react';
 import { Plus, ShieldCheck, Clock, Check, AlertTriangle, QrCode, FileText, Eye } from 'lucide-react';
-import Button from "@/utils/button";
+import Button from "@/components/common/button";
 import { workPermitFilters } from '@/constants/constant';
-import FilterTabs from '@/utils/roundedFilters';
-import StatCard from '@/utils/dashStatCard';
-import InfoBanner from '@/utils/infoBanner';
+import FilterTabs from '@/components/common/roundedFilters';
+import StatCard from '@/components/common/dashStatCard';
+import InfoBanner from '@/components/common/infoBanner';
 
 export default function WorkPermitPortal() {
-  const [activeTab, setActiveTab] = useState<string>('TFM Requests');
+ 
   const [activeFilter, setActiveFilter] = useState<string>('All');
 
   // Permit Data matching the UI
diff --git a/components/dashboard/activityFeed.tsx b/components/dashboard/overview/activityFeed.tsx
similarity index 94%
rename from components/dashboard/activityFeed.tsx
rename to components/dashboard/overview/activityFeed.tsx
index acf44e4..9beaa1c 100644
--- a/components/dashboard/activityFeed.tsx
+++ b/components/dashboard/overview/activityFeed.tsx
@@ -1,4 +1,4 @@
-import { ActivityFeedProps } from "@/constants/types"
+import { ActivityFeedProps } from "@/types/types"
 
 
 
diff --git a/components/dashboard/buildingOwner.tsx b/components/dashboard/overview/buildingOwner.tsx
similarity index 91%
rename from components/dashboard/buildingOwner.tsx
rename to components/dashboard/overview/buildingOwner.tsx
index 084accc..6225078 100644
--- a/components/dashboard/buildingOwner.tsx
+++ b/components/dashboard/overview/buildingOwner.tsx
@@ -1,14 +1,14 @@
 import { Building2, ShieldCheck, Database, Leaf, FileSpreadsheet } from "lucide-react";
-import StatCard from "@/utils/dashStatCard"; 
+import StatCard from "@/components/common/dashStatCard"; 
 import { energyData } from "@/constants/constant";
-import BarChart from "@/utils/barchart";
-import InfoBanner from "@/utils/infoBanner";
-import Button from "@/utils/button";
-import { ProgressBarRow } from "@/utils/progressBarRow";
+import BarChart from "@/components/charts/barchart";
+import InfoBanner from "@/components/common/infoBanner";
+import Button from "@/components/common/button";
+import { ProgressBarRow } from "@/components/charts/progressBarRow";
 
 // Import your custom Card components
-import { Card } from "@/utils/cardWrapper"; 
-import { CardHeader } from "@/utils/cardHeader"; 
+import { Card } from "@/components/common/cardWrapper"; 
+import { CardHeader } from "@/components/common/cardHeader"; 
 
 export default function BuildingOwnerPortal() {
   return (
diff --git a/components/dashboard/dashboard.tsx b/components/dashboard/overview/dashboard.tsx
similarity index 95%
rename from components/dashboard/dashboard.tsx
rename to components/dashboard/overview/dashboard.tsx
index 8adb143..3fd303a 100644
--- a/components/dashboard/dashboard.tsx
+++ b/components/dashboard/overview/dashboard.tsx
@@ -1,13 +1,13 @@
 
 import { Check } from 'lucide-react';
-import BarChart from "@/utils/barchart";
-import StatCard from "@/utils/dashStatCard";
-import ActivityFeed from "@/components/dashboard/activityFeed";
+import BarChart from "@/components/charts/barchart";
+import StatCard from "@/components/common/dashStatCard";
+import ActivityFeed from "@/components/dashboard/overview/activityFeed";
 import {activities, chartData} from "@/constants/constant"
-import { Card } from '@/utils/cardWrapper';
-import {CardHeader} from '@/utils/cardHeader';
-import {ProgressBarRow }from '@/utils/progressBarRow';
-import {StatusProgressRow} from '@/utils/statusProgressRow';
+import { Card } from '@/components/common/cardWrapper';
+import {CardHeader} from '@/components/common/cardHeader';
+import {ProgressBarRow }from '@/components/charts/progressBarRow';
+import {StatusProgressRow} from '@/components/charts/statusProgressRow';
 
 export default function Dashboard() {
  
diff --git a/components/dashboard/engagement.tsx b/components/dashboard/overview/engagement.tsx
similarity index 96%
rename from components/dashboard/engagement.tsx
rename to components/dashboard/overview/engagement.tsx
index cf41d98..1169cd5 100644
--- a/components/dashboard/engagement.tsx
+++ b/components/dashboard/overview/engagement.tsx
@@ -8,13 +8,13 @@ import {
 } from "lucide-react";
       
 import { SATISFACTION_DRIVERS, TICKETS_DATA } from "@/constants/constant";
-import StatCard from "../../utils/dashStatCard";
-import Button from "@/utils/button";
-import InfoBanner from "@/utils/infoBanner";
+import StatCard from "../../common/dashStatCard";
+import Button from "@/components/common/button";
+import InfoBanner from "@/components/common/infoBanner";
 
 // Import your custom Card components
-import { Card } from "@/utils/cardWrapper"; 
-import { CardHeader } from "@/utils/cardHeader"; 
+import { Card } from "@/components/common/cardWrapper"; 
+import { CardHeader } from "@/components/common/cardHeader"; 
 
 export default function EngagementPage() {
   return (
diff --git a/components/dashboard/propertyManager.tsx b/components/dashboard/overview/propertyManager.tsx
similarity index 94%
rename from components/dashboard/propertyManager.tsx
rename to components/dashboard/overview/propertyManager.tsx
index 152da84..180d648 100644
--- a/components/dashboard/propertyManager.tsx
+++ b/components/dashboard/overview/propertyManager.tsx
@@ -1,7 +1,7 @@
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import InfoBanner from "@/utils/infoBanner";
-import { ProgressBarRow } from "@/utils/progressBarRow";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import InfoBanner from "@/components/common/infoBanner";
+import { ProgressBarRow } from "@/components/charts/progressBarRow";
 import { 
   FileText, 
   Wrench, 
@@ -12,8 +12,8 @@ import {
 } from "lucide-react";
 
 // Import your custom Card components
-import { Card } from "@/utils/cardWrapper"; 
-import { CardHeader } from "@/utils/cardHeader";
+import { Card } from "@/components/common/cardWrapper"; 
+import { CardHeader } from "@/components/common/cardHeader";
 
 
 export default function PropertyManagerPortal() {
diff --git a/components/dashboard/serviceEngineer.tsx b/components/dashboard/overview/serviceEngineer.tsx
similarity index 97%
rename from components/dashboard/serviceEngineer.tsx
rename to components/dashboard/overview/serviceEngineer.tsx
index 9e92a85..ad7bf4d 100644
--- a/components/dashboard/serviceEngineer.tsx
+++ b/components/dashboard/overview/serviceEngineer.tsx
@@ -1,6 +1,6 @@
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import InfoBanner from "@/utils/infoBanner";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import InfoBanner from "@/components/common/infoBanner";
 import { 
   FileText, 
   Wrench, 
@@ -11,8 +11,8 @@ import {
 } from "lucide-react";
 
 // Import your custom Card components
-import { Card } from "@/utils/cardWrapper"; 
-import { CardHeader } from "@/utils/cardHeader"; 
+import { Card } from "@/components/common/cardWrapper"; 
+import { CardHeader } from "@/components/common/cardHeader"; 
 
 export default function ServiceEngineerPortal() {
   return (
diff --git a/components/dashboard/workplace/meetingRoom.tsx b/components/dashboard/workplace/meetingRoom.tsx
new file mode 100644
index 0000000..68679a3
--- /dev/null
+++ b/components/dashboard/workplace/meetingRoom.tsx
@@ -0,0 +1,179 @@
+import { useState } from 'react';
+import { 
+  Calendar, 
+  Clock, 
+  Activity, 
+  Check, 
+  Plus,
+  Pencil,
+  Trash2
+} from "lucide-react";
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import { roomData, scheduleData } from '@/constants/constant';
+import { Card } from '@/components/common/cardWrapper';
+import { CardHeader } from '@/components/common/cardHeader';
+
+// Your Card Comp
+
+export default function MeetingRoomPortal() {
+  return (
+    <div className="my-15 text-slate-100 font-sans">
+      {/* --- HEADER SECTION --- */}
+      <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-6">
+        <div>
+          <div className="flex items-center gap-2 text-[10px] font-bold tracking-widest text-slate-500 uppercase font-mono">
+            <span className="text-teal-400">Apple One — HQ Tower</span>
+            <span>•</span>
+            <span>WORKPLACE</span>
+            <span>•</span>
+            <span>MEETING ROOMS</span>
+          </div>
+          <h1 className="text-2xl font-bold text-white tracking-tight mt-1">
+            Meeting room booking
+          </h1>
+          <p className="text-sm font-medium text-slate-400 mt-1 max-w-xl leading-relaxed">
+            Real-time availability, calendar-synced reservations, room services and utilization analytics.
+          </p>
+        </div>
+
+        {/* --- HEADER BUTTONS --- */}
+        <div className="flex items-center gap-2.5 self-start md:mt-6">
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-3.5 py-2 rounded-lg flex items-center gap-2 font-semibold transition-colors">
+            <Calendar className="w-4 h-4 text-slate-300" />
+            <span>Sync calendar</span>
+          </Button>
+
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-3.5 py-2 rounded-lg flex items-center gap-2 font-semibold transition-colors">
+            <Plus className="w-4 h-4 text-slate-300" />
+            <span>Add room</span>
+          </Button>
+
+          <Button className="bg-teal-400 hover:bg-teal-300 text-slate-950 font-bold text-xs px-4 py-2 rounded-lg flex items-center gap-1.5 transition-colors">
+            <Plus className="w-4 h-4 stroke-[3]" />
+            <span>Book room</span>
+          </Button>
+        </div>
+      </div>
+
+      {/* --- STAT CARDS --- */}
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+        {/* Available now */}
+        <StatCard
+          variant="icon"
+          title="Available now"
+          value="3"
+          icon={Calendar}
+          badgeText="of 6 rooms"
+          badgeClassName="text-emerald-400 lowercase font-mono"
+          iconContainerClassName="bg-emerald-950/40 border-emerald-800/30 text-emerald-400"
+        />
+
+        {/* In use now */}
+        <StatCard
+          variant="icon"
+          title="In use now"
+          value="2"
+          icon={Clock}
+          badgeText="live"
+          badgeClassName="text-rose-400 lowercase font-mono"
+          iconContainerClassName="bg-rose-950/40 border-rose-900/30 text-rose-400"
+        />
+
+        {/* Utilization */}
+        <StatCard
+          variant="icon"
+          title="Utilization"
+          value="50%"
+          icon={Activity}
+          badgeText="today"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-blue-950/50 border-blue-800/30 text-blue-400"
+        />
+
+        {/* Bookings today */}
+        <StatCard
+          variant="icon"
+          title="Bookings today"
+          value="5"
+          icon={Check}
+          badgeText="scheduled"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-amber-950/40 border-amber-800/30 text-amber-500"
+        />
+      </div>
+
+      {/* --- MAIN CONTENT UI (ADDED BELOW STAT CARDS) --- */}
+      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
+        {/* Room List (Left 2 Columns) */}
+        <div className="lg:col-span-2 grid grid-cols-1 md:grid-cols-2 gap-4">
+          {roomData.map((room) => (
+            <Card key={room.id} className="min-h-[170px]">
+              <div>
+                {/* Header info inside room card */}
+                <div className="flex justify-between items-start mb-1">
+                  <div>
+                    <h3 className="text-white font-semibold text-base">{room.name}</h3>
+                    <p className="text-xs text-slate-400 font-mono mt-0.5">{room.location}</p>
+                  </div>
+                  <span className={`flex items-center gap-1.5 px-2 py-0.5 rounded text-[10px] font-mono font-bold border ${room.statusColor}`}>
+                    <span className={`w-1.5 h-1.5 rounded-full ${room.dotColor}`} />
+                    {room.status}
+                  </span>
+                </div>
+
+                {/* Feature Tags */}
+                <div className="flex flex-wrap gap-1.5 my-3">
+                  {room.tags.map((tag, idx) => (
+                    <span key={idx} className="bg-[#12233a] border border-[#1d3554] text-slate-300 text-[11px] px-2 py-0.5 rounded">
+                      {tag}
+                    </span>
+                  ))}
+                </div>
+              </div>
+
+              {/* Bottom Info & Action Buttons */}
+              <div className="flex items-center justify-between border-t border-[#162942]/60 pt-3 mt-2">
+                <span className="text-xs text-slate-400">{room.subtitle}</span>
+                <div className="flex items-center gap-1.5">
+                  <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-200 text-xs font-semibold px-3 py-1.5 rounded transition-colors">
+                    {room.actionType === "book" ? "Book" : "View"}
+                  </button>
+                  <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-400 hover:text-slate-200 p-1.5 rounded transition-colors">
+                    <Pencil className="w-3.5 h-3.5" />
+                  </button>
+                  <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-400 hover:text-rose-400 p-1.5 rounded transition-colors">
+                    <Trash2 className="w-3.5 h-3.5" />
+                  </button>
+                </div>
+              </div>
+            </Card>
+          ))}
+        </div>
+
+        {/* Today's Schedule Timeline (Right 1 Column) */}
+        <div>
+          <Card className="h-full justify-start">
+            <CardHeader title="Today’s schedule" subtitle="Apple One — HQ Tower" />
+            <div className="mt-4 space-y-6 relative before:absolute before:inset-0 before:left-[7px] before:w-[2px] before:bg-[#1d3554] pl-6">
+              {scheduleData.map((item, idx) => (
+                <div key={idx} className="relative">
+                  {/* Timeline dot */}
+                  <span className="absolute -left-[23px] top-1 w-3.5 h-3.5 rounded-full border-2 border-[#0a1526] bg-teal-400 ring-2 ring-teal-400/20" />
+                  
+                  {/* Event Details */}
+                  <h4 className="text-sm font-semibold text-white leading-tight">
+                    {item.room} <span className="text-slate-400 font-normal">• {item.title}</span>
+                  </h4>
+                  <p className="text-xs text-slate-500 font-mono mt-1">
+                    {item.time} <span className="text-slate-600">•</span> {item.status}
+                  </p>
+                </div>
+              ))}
+            </div>
+          </Card>
+        </div>
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/components/dashboard/visitorManagement.tsx b/components/dashboard/workplace/visitorManagement.tsx
similarity index 97%
rename from components/dashboard/visitorManagement.tsx
rename to components/dashboard/workplace/visitorManagement.tsx
index 93f97c8..0f474cb 100644
--- a/components/dashboard/visitorManagement.tsx
+++ b/components/dashboard/workplace/visitorManagement.tsx
@@ -7,12 +7,12 @@ import {
   BarChart2, 
   Plus 
 } from "lucide-react";
-import Button from "@/utils/button";
-import StatCard from "@/utils/dashStatCard";
-import InfoBanner from "@/utils/infoBanner";
-import FilterTabs from '@/utils/roundedFilters';
+import Button from "@/components/common/button";
+import StatCard from "@/components/common/dashStatCard";
+import InfoBanner from "@/components/common/infoBanner";
+import FilterTabs from '@/components/common/roundedFilters';
 import { visitorFilters } from '@/constants/constant';
-import Table from '@/utils/dataTable';
+import Table from '@/components/common/dataTable';
 
 export default function VistiorManagementPortal() {
     const headers = [
diff --git a/components/dashboard/workplace/workspace.tsx b/components/dashboard/workplace/workspace.tsx
new file mode 100644
index 0000000..e4fdf39
--- /dev/null
+++ b/components/dashboard/workplace/workspace.tsx
@@ -0,0 +1,218 @@
+import {
+  Activity,
+  Monitor,
+  Clock,
+  ShieldCheck,
+  Pencil,
+  Trash2,
+  Sparkles,
+  Plus
+} from "lucide-react";
+
+import InfoBanner from "@/components/common/infoBanner";
+import Button from "@/components/common/button";
+import NavigationTabs from "@/components/common/tabs";
+
+import { useState } from "react";
+import { workspaceTabs, zoneUtilizationData } from "@/constants/constant";
+import StatCard from "@/components/common/dashStatCard";
+import { Card } from '@/components/common/cardWrapper';
+import { CardHeader } from '@/components/common/cardHeader';
+
+export default function WorkSpacePortal() {
+  const [activeTab, setActiveTab] = useState<string>("Desk Booking");
+
+  // Grid state matching the UI: 4 rows x 12 columns (48 seats)
+  // Types: 'occupied' (red/purple outline), 'free' (teal), 'reserved' (amber)
+  const deskGrid = Array.from({ length: 48 }).map((_, index) => {
+    if (index === 42) return "reserved"; // 1 Reserved desk
+    if (index >= 36) return "free";       // Free desks on the bottom row
+    return "occupied";                    // Occupied desks
+  });
+
+  return (
+    <div className="my-15 text-slate-100 font-sans">
+      {/* --- HEADER SECTION WITH BUTTONS --- */}
+      <div className="flex flex-col md:flex-row md:items-start md:justify-between gap-4 mb-6">
+        <div>
+          <div className="flex items-center gap-2 text-[10px] font-bold tracking-widest text-slate-500 uppercase font-mono">
+            <span className="text-teal-400">Apple One — HQ Tower</span>
+            <span>•</span>
+            <span>WORKPLACE</span>
+            <span>•</span>
+            <span>WORKSPACE</span>
+          </div>
+
+          <h1 className="text-2xl font-bold text-white tracking-tight mt-2">
+            Workspace management
+          </h1>
+
+          <p className="text-sm font-medium text-slate-400 mt-2 max-w-xl leading-relaxed">
+            Desk booking, live floor plans and shift timetable — unified, all reading the Block → Floor → Zone master.
+          </p>
+        </div>
+
+        {/* --- ACTION BUTTONS --- */}
+        <div className="flex items-center gap-2.5 self-start mt-10">
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-3.5 py-2 rounded-lg flex items-center gap-2 font-semibold transition-colors">
+            <Sparkles className="w-4 h-4 text-slate-300" />
+            <span>Policies</span>
+          </Button>
+
+          <Button className="bg-[#0b1727] hover:bg-slate-800/60 text-slate-200 border border-slate-800 text-xs px-3.5 py-2 rounded-lg flex items-center gap-2 font-semibold transition-colors">
+            <Plus className="w-4 h-4 text-slate-300" />
+            <span>Add zone</span>
+          </Button>
+
+          <Button className="bg-teal-400 hover:bg-teal-300 text-slate-950 font-bold text-xs px-4 py-2 rounded-lg flex items-center gap-1.5 transition-colors">
+            <Plus className="w-4 h-4 stroke-[3]" />
+            <span>Book desk</span>
+          </Button>
+        </div>
+      </div>
+
+      {/* Navigation Tabs */}
+      <NavigationTabs
+        tabs={workspaceTabs}
+        activeTab={activeTab}
+        onTabChange={setActiveTab}
+        className="mb-6"
+      />
+
+      {/* --- STAT CARDS --- */}
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-6">
+        {/* Total desks */}
+        <StatCard
+          variant="icon"
+          title="Total desks"
+          value="162"
+          icon={Monitor}
+          badgeText="4 zones"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-blue-950/40 border-blue-800/30 text-blue-400"
+        />
+
+        {/* Available */}
+        <StatCard
+          variant="icon"
+          title="Available"
+          value="39"
+          icon={ShieldCheck}
+          badgeText="free now"
+          badgeClassName="text-emerald-400 lowercase font-mono"
+          iconContainerClassName="bg-emerald-950/40 border-emerald-800/30 text-emerald-400"
+        />
+
+        {/* Occupied */}
+        <StatCard
+          variant="icon"
+          title="Occupied"
+          value="123"
+          icon={Clock}
+          badgeText="checked in"
+          badgeClassName="text-rose-400 lowercase font-mono"
+          iconContainerClassName="bg-rose-950/40 border-rose-900/30 text-rose-400"
+        />
+
+        {/* Utilization */}
+        <StatCard
+          variant="icon"
+          title="Utilization"
+          value="76%"
+          icon={Activity}
+          badgeText="today"
+          badgeClassName="text-slate-400 lowercase font-mono"
+          iconContainerClassName="bg-amber-950/40 border-amber-800/30 text-amber-400"
+        />
+      </div>
+
+      {/* --- OCCUPANCY & ZONE UTILIZATION SECTION --- */}
+      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-8">
+        {/* Live Occupancy Grid (Left 2 Columns) */}
+        <Card className="lg:col-span-2 justify-start">
+          <CardHeader 
+            title="Live occupancy · North Wing L8" 
+            subtitle="39 / 48 occupied" 
+          />
+          
+          {/* Desk Layout Grid */}
+          <div className="grid grid-cols-6 sm:grid-cols-12 gap-2 my-4">
+            {deskGrid.map((type, i) => (
+              <div
+                key={i}
+                className={`h-10 rounded-lg border transition-all ${
+                  type === "occupied"
+                    ? "bg-[#181828]/50 border-rose-500/30"
+                    : type === "free"
+                    ? "bg-teal-950/30 border-teal-500/50"
+                    : "bg-slate-900/60 border-amber-500/50"
+                }`}
+              />
+            ))}
+          </div>
+
+          {/* Map Legend */}
+          <div className="flex items-center gap-6 mt-2 pt-2 text-xs text-slate-400">
+            <div className="flex items-center gap-2">
+              <span className="w-3 h-3 rounded border border-teal-500/50 bg-teal-950/30" />
+              <span>Free</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <span className="w-3 h-3 rounded border border-amber-500/50 bg-slate-900/60" />
+              <span>Reserved</span>
+            </div>
+            <div className="flex items-center gap-2">
+              <span className="w-3 h-3 rounded border border-rose-500/30 bg-[#181828]/50" />
+              <span>Occupied</span>
+            </div>
+          </div>
+        </Card>
+
+        {/* Zone Utilization Bars (Right 1 Column) */}
+        <Card className="justify-start">
+          <CardHeader title="Zone utilization" />
+
+          <div className="space-y-5 mt-3">
+            {zoneUtilizationData.map((zone, idx) => {
+              const percentage = Math.round((zone.current / zone.max) * 100);
+              return (
+                <div key={idx} className="flex items-center justify-between gap-3">
+                  <span className="text-xs font-medium text-slate-300 w-32 truncate">
+                    {zone.name}
+                  </span>
+
+                  {/* Progress Bar Container */}
+                  <div className="flex-1 bg-[#12233a] h-2 rounded-full overflow-hidden">
+                    <div
+                      className={`h-full ${zone.barColor} transition-all duration-300`}
+                      style={{ width: `${percentage}%` }}
+                    />
+                  </div>
+
+                  {/* Value & Actions */}
+                  <div className="flex items-center gap-2 font-mono text-xs text-slate-200">
+                    <span className="font-bold">{zone.current}/{zone.max}</span>
+                    <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-400 hover:text-slate-200 p-1 rounded transition-colors">
+                      <Pencil className="w-3 h-3" />
+                    </button>
+                    <button className="bg-[#12233a] hover:bg-[#1a3252] border border-[#1d3554] text-slate-400 hover:text-rose-400 p-1 rounded transition-colors">
+                      <Trash2 className="w-3 h-3" />
+                    </button>
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        </Card>
+      </div>
+
+      {/* Info Banner */}
+      <div className="my-8">
+        <InfoBanner
+          boldText="Policy:"
+          normalText="hot desks auto-release after a 15-min no-show; fixed desks are role-assigned; collaboration zones are first-come via QR check-in."
+        />
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/utils/navbar.tsx b/components/layouts/navbar.tsx
similarity index 100%
rename from utils/navbar.tsx
rename to components/layouts/navbar.tsx
diff --git a/utils/sideBarItem.tsx b/components/layouts/sideBarItem.tsx
similarity index 63%
rename from utils/sideBarItem.tsx
rename to components/layouts/sideBarItem.tsx
index f142b20..96c09ab 100644
--- a/utils/sideBarItem.tsx
+++ b/components/layouts/sideBarItem.tsx
@@ -3,8 +3,8 @@
 import Link from "next/link";
 import { useState } from "react";
 import { ChevronDown } from "lucide-react";
-import {Props} from "@/constants/types";
-import Button  from "@/utils/button";
+import {Props} from "@/types/types";
+import Button  from "@/components/common/button";
 
 export default function SidebarItem({ item }: Props) {
   const [open, setOpen] = useState(item.title === "Overview");
@@ -13,16 +13,17 @@ export default function SidebarItem({ item }: Props) {
     <div className=" border-b border-slate-800 ">
       <Button
         onClick={() => setOpen(!open)}
-        className="flex w-full items-center justify-between px-5 py-4 hover:bg-slate-900"
+        className="flex w-full items-center justify-between
+         px-3 py-4 hover:bg-slate-900"
       >
-        <div className="flex items-center gap-3">
-          <item.icon size={20} />
+        <div className="flex items-center gap-2">
+          <item.icon size={16} />
 
-          <span className="font-medium">{item.title}</span>
+          <span className="text-base">{item.title}</span>
         </div>
 
         <ChevronDown
-          size={18}
+          size={16}
           className={`transition-transform ${
             open ? "rotate-180" : ""
           }`}
@@ -30,14 +31,14 @@ export default function SidebarItem({ item }: Props) {
       </Button>
 
       {open && item.children.length > 0 && (
-        <div className="ml-6 border-l border-slate-700 pl-4 pb-2">
+        <div className="ml-4 border-l border-slate-700 pl-2 pb-1">
           {item.children.map((child: any) => (
             <Link
               key={child.title}
               href={child.href}
-              className="group mt-2 flex items-center gap-3 rounded-lg px-3 py-2 text-slate-300 hover:bg-teal-500/20 hover:text-teal-400"
+              className="group mt-2 flex items-center gap-3 rounded-lg px-2 py-2 text-slate-300 hover:bg-teal-500/20 hover:text-teal-400"
             >
-              <child.icon size={18} />
+              <child.icon size={16} />
 
               <span>{child.title}</span>
             </Link>
diff --git a/utils/sidebar.tsx b/components/layouts/sidebar.tsx
similarity index 97%
rename from utils/sidebar.tsx
rename to components/layouts/sidebar.tsx
index 6369f17..5589933 100644
--- a/utils/sidebar.tsx
+++ b/components/layouts/sidebar.tsx
@@ -38,11 +38,11 @@ console.log("Session data ",session?.user?.email)
         </button>
       </div>
 
-      <p className="px-4 pt-2 pb-1 text-xs font-semibold uppercase 
+      <p className="px-2 pt-2 pb-1 text-xs font-semibold uppercase 
       tracking-wider text-slate-500">
         Tenant runtime
       </p>
-      <div className="py-3">
+      <div className="py-2">
         {SIDEBAR_ITEMS.map((item) => (
           <SidebarItem
             key={item.title}
diff --git a/constants/constant.ts b/constants/constant.ts
index 0840e80..5f5898e 100644
--- a/constants/constant.ts
+++ b/constants/constant.ts
@@ -1,5 +1,5 @@
 
-  import { TableRowData } from '@/constants/types';
+  import { TableRowData } from '@/types/types';
 import {
    LayoutGrid,
   Smile,
@@ -214,6 +214,12 @@ export const Reqeusttabs: string[] = [
     { label: 'Completed', count: 3 },
     { label: 'Overdue', count: 4 },
   ];
+export const reportFilters = [
+    { label: 'Site: All' },
+    { label: 'Group: all' },
+    { label: 'Status:All' },
+   
+  ];
 
 
    export const workPermitFilters = [
@@ -239,17 +245,218 @@ export const Reqeusttabs: string[] = [
   // Data model interface
   
   
-  // Sample data extracted from your screenshot
- export const mockData: TableRowData[] = [
-    { id: '1', block: 'Block 1', floor: 'G', zone: 'Z2', department: 'Electrical', location: 'Main lobby', window: '06:00–17:30', tat: '60m', sched: 8, approval: true, status: 'INACTIVE' },
-    { id: '2', block: 'Block 2', floor: '3', zone: 'Z2', department: 'Electrical', location: 'Main lobby', window: '08:00–23:59', tat: '30m', sched: 4, approval: false, status: 'ACTIVE' },
-    { id: '3', block: 'Block 2', floor: '3', zone: 'Z1', department: 'Inspection work', location: 'Cafeteria', window: '06:00–17:30', tat: '20m', sched: 8, approval: true, status: 'ACTIVE' },
-    { id: '4', block: 'Block 1', floor: 'G', zone: 'Z1', department: 'HVAC', location: 'Server room', window: '08:00–18:00', tat: '30m', sched: 4, approval: false, status: 'INACTIVE' },
-    { id: '5', block: 'Block 2', floor: '3', zone: 'N', department: 'Inspection work', location: 'Server room', window: '08:00–18:00', tat: '60m', sched: 8, approval: true, status: 'ACTIVE' },
-    { id: '6', block: 'Block 2', floor: 'G', zone: 'Z1', department: 'Electrical', location: 'Reception', window: '06:00–18:00', tat: '60m', sched: 6, approval: false, status: 'ACTIVE' },
-    { id: '7', block: 'Block 1', floor: 'G', zone: 'Z2', department: 'Electrical', location: 'Food court', window: '06:00–17:30', tat: '60m', sched: 8, approval: true, status: 'ACTIVE' },
-    { id: '8', block: 'Block 2', floor: '3', zone: 'Z2', department: 'Electrical', location: 'Cafeteria', window: '08:00–23:59', tat: '30m', sched: 4, approval: false, status: 'ACTIVE' },
-    { id: '9', block: 'Block 2', floor: '3', zone: 'Z1', department: 'Inspection work', location: 'Gym', window: '06:00–17:30', tat: '20m', sched: 8, approval: true, status: 'INACTIVE' },
-    { id: '10', block: 'Block 1', floor: 'G', zone: 'Z1', department: 'HVAC', location: 'Lobby', window: '08:00–18:00', tat: '30m', sched: 4, approval: false, status: 'ACTIVE' },
+  
+
+  export const roomData = [
+  {
+    id: 1,
+    name: "Boardroom A",
+    location: "L10 • 16 seats",
+    status: "OCCUPIED",
+    statusColor: "bg-rose-500/10 text-rose-400 border-rose-500/20",
+    dotColor: "bg-rose-400",
+    tags: ["Video", "Display", "VC"],
+    subtitle: "Until 11:30 • Quarterly review",
+    actionType: "view"
+  },
+  {
+    id: 2,
+    name: "Huddle 1",
+    location: "L8 • 4 seats",
+    status: "AVAILABLE",
+    statusColor: "bg-emerald-500/10 text-emerald-400 border-emerald-500/20",
+    dotColor: "bg-emerald-400",
+    tags: ["Display"],
+    subtitle: "Free now",
+    actionType: "book"
+  },
+  {
+    id: 3,
+    name: "Training Hall",
+    location: "L2 • 40 seats",
+    status: "RESERVED",
+    statusColor: "bg-amber-500/10 text-amber-400 border-amber-500/20",
+    dotColor: "bg-amber-400",
+    tags: ["Projector", "Mic", "Catering"],
+    subtitle: "Until 14:00 • Safety induction",
+    actionType: "view"
+  },
+  {
+    id: 4,
+    name: "Focus Room 3",
+    location: "L8 • 2 seats",
+    status: "AVAILABLE",
+    statusColor: "bg-emerald-500/10 text-emerald-400 border-emerald-500/20",
+    dotColor: "bg-emerald-400",
+    tags: ["Display"],
+    subtitle: "Free now",
+    actionType: "book"
+  },
+  {
+    id: 5,
+    name: "Conf B",
+    location: "L5 • 10 seats",
+    status: "OCCUPIED",
+    statusColor: "bg-rose-500/10 text-rose-400 border-rose-500/20",
+    dotColor: "bg-rose-400",
+    tags: ["Video", "VC", "Whiteboard"],
+    subtitle: "Until 12:15 • Vendor call",
+    actionType: "view"
+  },
+  {
+    id: 6,
+    name: "Collab Zone",
+    location: "L3 • 8 seats",
+    status: "AVAILABLE",
+    statusColor: "bg-emerald-500/10 text-emerald-400 border-emerald-500/20",
+    dotColor: "bg-emerald-400",
+    tags: ["Display", "Whiteboard"],
+    subtitle: "Free now",
+    actionType: "book"
+  }
+];
+
+ export const scheduleData = [
+  {
+    room: "Boardroom A",
+    title: "Quarterly business review",
+    time: "09:00",
+    status: "occupied"
+  },
+  {
+    room: "Conf B",
+    title: "Vendor onboarding call",
+    time: "10:00",
+    status: "occupied"
+  },
+  {
+    room: "Training Hall",
+    title: "Fire-safety induction",
+    time: "11:30",
+    status: "reserved"
+  },
+  {
+    room: "Collab Zone",
+    title: "Design sprint",
+    time: "14:00",
+    status: "available"
+  },
+  {
+    room: "Huddle 1",
+    title: "1:1 sync",
+    time: "16:00",
+    status: "available"
+  }
+];
+export const workspaceTabs: string[] = [
+    'Desk Booking', 
+    'Floor Plan', 
+    'TimeTable', 
+    
   ];
-  
\ No newline at end of file
+  export const reporttabs: string[] = [
+    'Equipment', 
+    'Maintance', 
+    'Checklists', 
+    'Requests', 
+    'Inventory', 
+    'Energy',
+    'HSQE', 
+    'MMR',
+
+    
+  ];
+
+  // Mock Data for Zone Utilization
+  export const zoneUtilizationData = [
+    { name: "North Wing · L8", current: 39, max: 48, barColor: "bg-amber-400" },
+    { name: "Quiet Zone · L8", current: 11, max: 24, barColor: "bg-teal-400" },
+    { name: "Collab · L3", current: 22, max: 30, barColor: "bg-amber-400" },
+    { name: "Hot Desk · L5", current: 51, max: 60, barColor: "bg-amber-400" },
+  ];
+
+  // Mock Data for Planned vs Actual Categories
+export const categoryData = [
+  {
+    category: "PPM & AMC contracts",
+    type: "OPEX",
+    planned: "₹48.0 L",
+    actual: "₹31.2 L",
+    variance: "+₹16.8 L",
+    varianceColor: "text-emerald-400",
+    utilization: 65,
+    barColor: "bg-teal-400"
+  },
+  {
+    category: "Reactive repairs",
+    type: "OPEX",
+    planned: "₹15.0 L",
+    actual: "₹16.8 L",
+    variance: "-₹1.8 L",
+    varianceColor: "text-rose-400",
+    utilization: 112,
+    barColor: "bg-rose-400"
+  },
+  {
+    category: "Energy & utilities",
+    type: "OPEX",
+    planned: "₹62.0 L",
+    actual: "₹54.1 L",
+    variance: "+₹7.9 L",
+    varianceColor: "text-emerald-400",
+    utilization: 87,
+    barColor: "bg-teal-400"
+  },
+  {
+    category: "Consumables & spares",
+    type: "OPEX",
+    planned: "₹9.0 L",
+    actual: "₹7.4 L",
+    variance: "+₹1.6 L",
+    varianceColor: "text-emerald-400",
+    utilization: 82,
+    barColor: "bg-teal-400"
+  },
+  {
+    category: "Equipment upgrades",
+    type: "CAPEX",
+    planned: "₹35.0 L",
+    actual: "₹12.0 L",
+    variance: "+₹23.0 L",
+    varianceColor: "text-emerald-400",
+    utilization: 34,
+    barColor: "bg-teal-400"
+  },
+  {
+    category: "Soft services",
+    type: "OPEX",
+    planned: "₹22.0 L",
+    actual: "₹20.5 L",
+    variance: "+₹1.5 L",
+    varianceColor: "text-emerald-400",
+    utilization: 93,
+    barColor: "bg-amber-400"
+  }
+];
+
+// Mock Data for Approval Queue
+export const approvalQueueData = [
+  {
+    id: "BUD-114",
+    title: "Chiller compressor overhaul",
+    meta: "L2 • FM Head • ₹4.8 L",
+    status: "pending"
+  },
+  {
+    id: "BUD-115",
+    title: "Q3 energy budget revision",
+    meta: "L3 • Finance • ₹12.0 L",
+    status: "pending"
+  },
+  {
+    id: "BUD-112",
+    title: "Fire panel AMC renewal",
+    meta: "L1 • Site • ₹2.6 L",
+    status: "completed"
+  }
+];
\ No newline at end of file
diff --git a/constants/types.ts b/types/types.ts
similarity index 97%
rename from constants/types.ts
rename to types/types.ts
index aaed3bb..5916e58 100644
--- a/constants/types.ts
+++ b/types/types.ts
@@ -1,6 +1,6 @@
 import { LucideProps } from "lucide-react";
 import { ComponentType } from "react";
-import { colorMap } from "./constant";
+import { colorMap } from "../constants/constant";