diff --git a/src/app/(main)/burst-pipe-analysis/page.tsx b/src/app/(main)/burst-pipe-analysis/page.tsx
index 7f1754c..6cb111c 100644
--- a/src/app/(main)/burst-pipe-analysis/page.tsx
+++ b/src/app/(main)/burst-pipe-analysis/page.tsx
@@ -2,7 +2,7 @@
 
 import MapComponent from "@app/OlMap/MapComponent";
 import MapToolbar from "@app/OlMap/Controls/Toolbar";
-import BurstPipeAnalysisPanel from "@/components/olmap/BurstPipeAnalysisPanel";
+import BurstPipeAnalysisPanel from "@/components/olmap/BurstPipeAnalysis/BurstPipeAnalysisPanel";
 
 export default function Home() {
   return (
diff --git a/src/app/(main)/monitoring-place-optimization/page.tsx b/src/app/(main)/monitoring-place-optimization/page.tsx
index 274703a..ef51c2c 100644
--- a/src/app/(main)/monitoring-place-optimization/page.tsx
+++ b/src/app/(main)/monitoring-place-optimization/page.tsx
@@ -2,7 +2,7 @@
 
 import MapComponent from "@app/OlMap/MapComponent";
 import MapToolbar from "@app/OlMap/Controls/Toolbar";
-import MonitoringPlaceOptimizationPanel from "@components/olmap/MonitoringPlaceOptimizationPanel";
+import MonitoringPlaceOptimizationPanel from "@components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel";
 export default function Home() {
   return (
     <div className="relative w-full h-full overflow-hidden">
diff --git a/src/app/(main)/network-partition-optimization/page.tsx b/src/app/(main)/network-partition-optimization/page.tsx
index ab64ace..ddf0a80 100644
--- a/src/app/(main)/network-partition-optimization/page.tsx
+++ b/src/app/(main)/network-partition-optimization/page.tsx
@@ -2,12 +2,11 @@
 
 import MapComponent from "@app/OlMap/MapComponent";
 import MapToolbar from "@app/OlMap/Controls/Toolbar";
-import ZonePropsPanel from "@components/olmap/ZonePropsPanel";
+import ZonePropsPanel from "@components/olmap/NetworkPartitionOptimization/ZonePropsPanel";
 export default function Home() {
   return (
     <div className="relative w-full h-full overflow-hidden">
       <MapComponent>
-        {/* <MapToolbar hiddenButtons={["style"]} /> */}
         <ZonePropsPanel />
       </MapComponent>
     </div>
diff --git a/src/components/olmap/BurstPipeAnalysisPanel.tsx b/src/components/olmap/BurstPipeAnalysis/BurstPipeAnalysisPanel.tsx
similarity index 97%
rename from src/components/olmap/BurstPipeAnalysisPanel.tsx
rename to src/components/olmap/BurstPipeAnalysis/BurstPipeAnalysisPanel.tsx
index aa1cf4c..0f20257 100644
--- a/src/components/olmap/BurstPipeAnalysisPanel.tsx
+++ b/src/components/olmap/BurstPipeAnalysis/BurstPipeAnalysisPanel.tsx
@@ -17,9 +17,9 @@ import {
   Search as SearchIcon,
   MyLocation as MyLocationIcon,
 } from "@mui/icons-material";
-import AnalysisParameters from "./BurstPipeAnalysis/AnalysisParameters";
-import SchemeQuery from "./BurstPipeAnalysis/SchemeQuery";
-import LocationResults from "./BurstPipeAnalysis/LocationResults";
+import AnalysisParameters from "./AnalysisParameters";
+import SchemeQuery from "./SchemeQuery";
+import LocationResults from "./LocationResults";
 interface SchemeDetail {
   burst_ID: string[];
   burst_size: number[];
diff --git a/src/components/olmap/MonitoringPlaceOptimizationPanel.tsx b/src/components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel.tsx
similarity index 97%
rename from src/components/olmap/MonitoringPlaceOptimizationPanel.tsx
rename to src/components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel.tsx
index eb75de5..a609c97 100644
--- a/src/components/olmap/MonitoringPlaceOptimizationPanel.tsx
+++ b/src/components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel.tsx
@@ -17,8 +17,8 @@ import {
   Analytics as AnalyticsIcon,
   Search as SearchIcon,
 } from "@mui/icons-material";
-import OptimizationParameters from "./MonitoringPlaceOptimization/OptimizationParameters";
-import SchemeQuery from "./MonitoringPlaceOptimization/SchemeQuery";
+import OptimizationParameters from "./OptimizationParameters";
+import SchemeQuery from "./SchemeQuery";
 
 interface SchemeRecord {
   id: number;
diff --git a/src/components/olmap/ZonePropsPanel.tsx b/src/components/olmap/NetworkPartitionOptimization/ZonePropsPanel.tsx
similarity index 100%
rename from src/components/olmap/ZonePropsPanel.tsx
rename to src/components/olmap/NetworkPartitionOptimization/ZonePropsPanel.tsx