diff --git a/src/components/Map/FcsAccordion.tsx b/src/components/Map/FcsAccordion.tsx
deleted file mode 100644
index b7a32e8a..00000000
--- a/src/components/Map/FcsAccordion.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { Spacer } from '@nextui-org/react';
-
-import FcsAccordionProps from '@/domain/props/FcsAccordionProps';
-import { FcsAccordionOperations } from '@/operations/map/FcsAccordionOperations';
-import { cardsWrapperClass } from '@/utils/primitives';
-
-import { ReactComponent as FoodConsumption } from '../../../public/Images/FoodConsumption.svg';
-import { ReactComponent as Import } from '../../../public/Images/Import.svg';
-import { ReactComponent as Population } from '../../../public/Images/Population.svg';
-import AccordionContainer from '../Accordions/AccordionContainer';
-import CustomCard from '../Cards/Card';
-import { LineChart } from '../Charts/LineChart';
-import CustomInfoCircle from '../CustomInfoCircle/CustomInfoCircle';
-
-export default function FcsAccordion({ countryData, loading, countryIso3Data, countryName }: FcsAccordionProps) {
-  const deltaOneMonth = countryData?.fcsMinus1 ? countryData.fcs - countryData.fcsMinus1 : null;
-  const deltaThreeMonth = countryData?.fcsMinus3 ? countryData.fcs - countryData.fcsMinus3 : null;
-  const fcsChartData = FcsAccordionOperations.getFcsChartData(countryData);
-  const rcsiChartData = FcsAccordionOperations.getRcsiChartData(countryData);
-  const currencyExchangeChartData = FcsAccordionOperations.getCurrencyExchangeChartData(countryIso3Data);
-  const balanceOfTradeChartData = FcsAccordionOperations.getBalanceOfTradeChartData(countryIso3Data);
-  const headlineAndFoodInflationChartData =
-    FcsAccordionOperations.getHeadlineAndFoodInflationChartData(countryIso3Data);
-  return (
-    <div className="absolute w-[350px] left-[108px] top-4 z-9999">
-      <AccordionContainer
-        loading={loading}
-        title={countryName ?? undefined}
-        accordionModalActive
-        maxWidth={600}
-        items={[
-          {
-            title: 'Food Security',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getFoodSecutriyPopoverInfo(),
-            content: (
-              <div className={cardsWrapperClass}>
-                <CustomCard
-                  title="Population"
-                  content={[
-                    {
-                      svgIcon: <Population className="w-full h-full object-contain" />,
-                      text: countryData?.population ? `${countryData.population.toFixed(2)} M` : 'N/A',
-                      altText: 'Population Icon',
-                    },
-                  ]}
-                />
-                <CustomCard
-                  title="People with insufficient food consumption"
-                  content={[
-                    {
-                      svgIcon: <FoodConsumption className="w-full h-full object-contain" />,
-                      text: countryData?.fcs ? `${countryData.fcs.toFixed(2)} M` : 'N/A',
-                      altText: 'Food Consumption Icon',
-                    },
-                    {
-                      imageSrc: deltaOneMonth && deltaOneMonth > 0 ? '/Images/ArrowUp.svg' : '/Images/ArrowDown.svg',
-                      text: deltaOneMonth ? `${deltaOneMonth.toFixed(2)} M` : 'N/A',
-                      timeText: '1 Month ago',
-                      altText: 'Icon',
-                    },
-                    {
-                      imageSrc:
-                        deltaThreeMonth && deltaThreeMonth > 0 ? '/Images/ArrowUp.svg' : '/Images/ArrowDown.svg',
-                      text: deltaThreeMonth ? `${deltaThreeMonth.toFixed(2)} M` : 'N/A',
-                      timeText: '3 Month ago',
-                      altText: 'Other Icon',
-                    },
-                  ]}
-                />
-              </div>
-            ),
-          },
-          {
-            title: 'Food Security Trends',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getFoodSecutriyTrendsPopoverInfo(),
-            content: (
-              <div>
-                {fcsChartData ? (
-                  <LineChart
-                    title="Trend of the number of people with insufficient food consumption"
-                    data={fcsChartData}
-                    small
-                    noPadding
-                    transparentBackground
-                  />
-                ) : (
-                  <p>No data about insufficient food consumption</p>
-                )}
-                <Spacer y={6} />
-                {rcsiChartData ? (
-                  <LineChart
-                    title="Trend of the number of people using crisis or above crisis food-based coping"
-                    data={rcsiChartData}
-                    small
-                    noPadding
-                    transparentBackground
-                  />
-                ) : (
-                  <p>No data about crisis or above crisis food-based coping</p>
-                )}
-              </div>
-            ),
-          },
-          {
-            title: 'Macro-economic',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getMacroEconomicPopoverInfo(),
-            content: (
-              <div className={cardsWrapperClass}>
-                <CustomCard
-                  title="Import Dependency"
-                  content={[
-                    {
-                      svgIcon: <Import className="w-full h-full object-contain" />,
-                      text: countryData?.importDependency
-                        ? `${countryData.importDependency.toFixed(1)}% of Cereals`
-                        : 'N/A',
-                      altText: 'Import Dependency Icon',
-                    },
-                  ]}
-                />
-              </div>
-            ),
-          },
-          {
-            title: 'Currency Exchange',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getCurrencyExchangePopoverInfo(),
-            content: (
-              <div>
-                {currencyExchangeChartData ? (
-                  <LineChart data={currencyExchangeChartData} small noPadding transparentBackground />
-                ) : (
-                  <p>No data about currency exchange</p>
-                )}
-              </div>
-            ),
-          },
-          {
-            title: 'Balance of Trade',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getBalanceOfTradePopoverInfo(),
-            content: (
-              <div>
-                {balanceOfTradeChartData ? (
-                  <LineChart data={balanceOfTradeChartData} small noPadding transparentBackground />
-                ) : (
-                  <p>No data about balance of trade</p>
-                )}
-              </div>
-            ),
-          },
-          {
-            title: 'Headline and food inflation',
-            infoIcon: <CustomInfoCircle />,
-            popoverInfo: FcsAccordionOperations.getHeadlineAndFoodInflationPopoverInfo(),
-            content: (
-              <div>
-                {headlineAndFoodInflationChartData ? (
-                  <LineChart data={headlineAndFoodInflationChartData} small noPadding transparentBackground />
-                ) : (
-                  <p>No data about headline and food inflation</p>
-                )}
-              </div>
-            ),
-          },
-        ]}
-      />
-    </div>
-  );
-}
diff --git a/src/components/Map/FcsRegionTooltip.tsx b/src/components/Map/FcsMap/FcsRegionTooltip.tsx
similarity index 97%
rename from src/components/Map/FcsRegionTooltip.tsx
rename to src/components/Map/FcsMap/FcsRegionTooltip.tsx
index 3ad1ad99..67017b26 100644
--- a/src/components/Map/FcsRegionTooltip.tsx
+++ b/src/components/Map/FcsMap/FcsRegionTooltip.tsx
@@ -3,7 +3,7 @@ import { Feature, GeoJsonProperties, Geometry } from 'geojson';
 import { FcsRegionTooltipOperations } from '@/operations/map/FcsRegionTooltipOperations';
 import { formatToMillion } from '@/utils/formatting';
 
-import { LineChart } from '../Charts/LineChart';
+import { LineChart } from '../../Charts/LineChart';
 
 interface FcsRegionTooltipProps {
   feature: Feature<Geometry, GeoJsonProperties>;
diff --git a/src/operations/map/FcsCountryChoroplethOperations.tsx b/src/operations/map/FcsCountryChoroplethOperations.tsx
index fc0c22e0..dbb20ed3 100644
--- a/src/operations/map/FcsCountryChoroplethOperations.tsx
+++ b/src/operations/map/FcsCountryChoroplethOperations.tsx
@@ -3,7 +3,7 @@ import L from 'leaflet';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 
-import FcsRegionTooltip from '@/components/Map/FcsRegionTooltip';
+import FcsRegionTooltip from '@/components/Map/FcsMap/FcsRegionTooltip';
 import { CountryMapData } from '@/domain/entities/country/CountryMapData.ts';
 import { MapOperations } from '@/operations/map/MapOperations';