diff --git a/src/app/[locale]/(main)/(container)/layout.tsx b/src/app/[locale]/(main)/(container)/layout.tsx
deleted file mode 100644
index d5303b5..0000000
--- a/src/app/[locale]/(main)/(container)/layout.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { DesktopView, MobileView } from '@/components/ResponsiveDesign';
-import { MOBILE_FOOTER_HEIGHT } from '@/config/responsive';
-import { Box, Container } from '@mui/material';
-import { FC, ReactNode } from 'react';
-
-export interface Layout {
-  children: ReactNode;
-}
-
-const Layout: FC<Layout> = async ({ children }) => {
-  return (
-    <>
-      <MobileView>
-        <Box
-          sx={{
-            paddingBottom: MOBILE_FOOTER_HEIGHT,
-          }}
-        >
-          {children}
-        </Box>
-      </MobileView>
-      <DesktopView>
-        <Container
-          maxWidth="xl"
-          sx={{
-            mt: 3,
-            pb: { xs: `${MOBILE_FOOTER_HEIGHT}px`, md: 0 },
-            minHeight: '70vh',
-          }}
-        >
-          {children}
-        </Container>
-      </DesktopView>
-    </>
-  );
-};
-
-export default Layout;
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/Header.tsx b/src/app/[locale]/(main)/(homepage)/components/Header.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/Header.tsx
rename to src/app/[locale]/(main)/(homepage)/components/Header.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainCategories.tsx b/src/app/[locale]/(main)/(homepage)/components/MainCategories.tsx
similarity index 96%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainCategories.tsx
rename to src/app/[locale]/(main)/(homepage)/components/MainCategories.tsx
index f26d51a..45e84a3 100644
--- a/src/app/[locale]/(main)/(container)/(homepage)/components/MainCategories.tsx
+++ b/src/app/[locale]/(main)/(homepage)/components/MainCategories.tsx
@@ -4,7 +4,7 @@ import { ChevronLeft } from '@mui/icons-material';
 import { Box, Grid, Link, Stack } from '@mui/material';
 import { grey } from '@mui/material/colors';
 import React, { FC } from 'react';
-import Image from '../../../../../../components/common/Image';
+import Image from '@/components/common/Image';
 
 export interface IMainCategory {
   id: number | string;
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx b/src/app/[locale]/(main)/(homepage)/components/MainSlider/MainSlider.tsx
similarity index 95%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx
rename to src/app/[locale]/(main)/(homepage)/components/MainSlider/MainSlider.tsx
index 52c9444..4147c35 100644
--- a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/MainSlider.tsx
+++ b/src/app/[locale]/(main)/(homepage)/components/MainSlider/MainSlider.tsx
@@ -28,9 +28,6 @@ const MainSlider: FC<MainSliderProps> = ({ items }) => {
       pagination={{
         clickable: true,
       }}
-      style={{
-        borderRadius: 16,
-      }}
     >
       {items?.map((item) => {
         return (
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/components/SliderItem/SliderItem.tsx b/src/app/[locale]/(main)/(homepage)/components/MainSlider/components/SliderItem/SliderItem.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/components/SliderItem/SliderItem.tsx
rename to src/app/[locale]/(main)/(homepage)/components/MainSlider/components/SliderItem/SliderItem.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/components/SliderItem/index.ts b/src/app/[locale]/(main)/(homepage)/components/MainSlider/components/SliderItem/index.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/components/SliderItem/index.ts
rename to src/app/[locale]/(main)/(homepage)/components/MainSlider/components/SliderItem/index.ts
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/index.ts b/src/app/[locale]/(main)/(homepage)/components/MainSlider/index.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/index.ts
rename to src/app/[locale]/(main)/(homepage)/components/MainSlider/index.ts
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/types/index.ts b/src/app/[locale]/(main)/(homepage)/components/MainSlider/types/index.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/types/index.ts
rename to src/app/[locale]/(main)/(homepage)/components/MainSlider/types/index.ts
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/ProductsSlider.tsx b/src/app/[locale]/(main)/(homepage)/components/ProductsSlider.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/ProductsSlider.tsx
rename to src/app/[locale]/(main)/(homepage)/components/ProductsSlider.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/SearchDialog.tsx b/src/app/[locale]/(main)/(homepage)/components/SearchDialog.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/SearchDialog.tsx
rename to src/app/[locale]/(main)/(homepage)/components/SearchDialog.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/components/SearchSection.tsx b/src/app/[locale]/(main)/(homepage)/components/SearchSection.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/components/SearchSection.tsx
rename to src/app/[locale]/(main)/(homepage)/components/SearchSection.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/loading.tsx b/src/app/[locale]/(main)/(homepage)/loading.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/loading.tsx
rename to src/app/[locale]/(main)/(homepage)/loading.tsx
diff --git a/src/app/[locale]/(main)/(container)/(homepage)/page.tsx b/src/app/[locale]/(main)/(homepage)/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/(homepage)/page.tsx
rename to src/app/[locale]/(main)/(homepage)/page.tsx
diff --git a/src/app/[locale]/(main)/(container)/[...slug]/page.tsx b/src/app/[locale]/(main)/[...slug]/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/[...slug]/page.tsx
rename to src/app/[locale]/(main)/[...slug]/page.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/components/CheckoutBox.tsx b/src/app/[locale]/(main)/cart/components/CheckoutBox.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/components/CheckoutBox.tsx
rename to src/app/[locale]/(main)/cart/components/CheckoutBox.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/components/DiscountCode.tsx b/src/app/[locale]/(main)/cart/components/DiscountCode.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/components/DiscountCode.tsx
rename to src/app/[locale]/(main)/cart/components/DiscountCode.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/components/EmptyCart.tsx b/src/app/[locale]/(main)/cart/components/EmptyCart.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/components/EmptyCart.tsx
rename to src/app/[locale]/(main)/cart/components/EmptyCart.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/components/Header.tsx b/src/app/[locale]/(main)/cart/components/Header.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/components/Header.tsx
rename to src/app/[locale]/(main)/cart/components/Header.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/components/Loading.tsx b/src/app/[locale]/(main)/cart/components/Loading.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/components/Loading.tsx
rename to src/app/[locale]/(main)/cart/components/Loading.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/hooks/useCheckoutItems.tsx b/src/app/[locale]/(main)/cart/hooks/useCheckoutItems.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/hooks/useCheckoutItems.tsx
rename to src/app/[locale]/(main)/cart/hooks/useCheckoutItems.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/loading.tsx b/src/app/[locale]/(main)/cart/loading.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/loading.tsx
rename to src/app/[locale]/(main)/cart/loading.tsx
diff --git a/src/app/[locale]/(main)/(container)/cart/page.tsx b/src/app/[locale]/(main)/cart/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/cart/page.tsx
rename to src/app/[locale]/(main)/cart/page.tsx
diff --git a/src/app/[locale]/(main)/(container)/checkout/components/AvailableShippingMethods.tsx b/src/app/[locale]/(main)/checkout/components/AvailableShippingMethods.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/checkout/components/AvailableShippingMethods.tsx
rename to src/app/[locale]/(main)/checkout/components/AvailableShippingMethods.tsx
diff --git a/src/app/[locale]/(main)/(container)/checkout/components/Billing.tsx b/src/app/[locale]/(main)/checkout/components/Billing.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/checkout/components/Billing.tsx
rename to src/app/[locale]/(main)/checkout/components/Billing.tsx
diff --git a/src/app/[locale]/(main)/(container)/checkout/components/ShippingMethodItem.tsx b/src/app/[locale]/(main)/checkout/components/ShippingMethodItem.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/checkout/components/ShippingMethodItem.tsx
rename to src/app/[locale]/(main)/checkout/components/ShippingMethodItem.tsx
diff --git a/src/app/[locale]/(main)/(container)/checkout/page.tsx b/src/app/[locale]/(main)/checkout/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/checkout/page.tsx
rename to src/app/[locale]/(main)/checkout/page.tsx
diff --git a/src/app/[locale]/(main)/layout.tsx b/src/app/[locale]/(main)/layout.tsx
index c2a443e..7965a09 100644
--- a/src/app/[locale]/(main)/layout.tsx
+++ b/src/app/[locale]/(main)/layout.tsx
@@ -1,4 +1,4 @@
-import { ISliderItem } from '@/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/types';
+import { ISliderItem } from '@/app/[locale]/(main)/(homepage)/components/MainSlider/types';
 import { Footer } from '@/components/Footer';
 import { Header } from '@/components/Header';
 import { getClient } from '@/graphql/clients/serverSideClient';
diff --git a/src/app/[locale]/(main)/(container)/not-found.tsx b/src/app/[locale]/(main)/not-found.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/not-found.tsx
rename to src/app/[locale]/(main)/not-found.tsx
diff --git a/src/app/[locale]/(main)/(container)/pages/[...slug]/page.tsx b/src/app/[locale]/(main)/pages/[...slug]/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/pages/[...slug]/page.tsx
rename to src/app/[locale]/(main)/pages/[...slug]/page.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/AddToCartDialog.tsx b/src/app/[locale]/(main)/products/[...params]/components/AddToCartDialog.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/AddToCartDialog.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/AddToCartDialog.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/BuyBox.tsx b/src/app/[locale]/(main)/products/[...params]/components/BuyBox.tsx
similarity index 98%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/BuyBox.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/BuyBox.tsx
index fe94b83..59951b2 100644
--- a/src/app/[locale]/(main)/(container)/products/[...params]/components/BuyBox.tsx
+++ b/src/app/[locale]/(main)/products/[...params]/components/BuyBox.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useProductContext } from '@/app/[locale]/(main)/(container)/products/[...params]/hooks/useProductContext';
+import { useProductContext } from '@/app/[locale]/(main)/products/[...params]/hooks/useProductContext';
 import CartItemController from '@/components/CartItemController/CartItemController';
 import useNewDialog from '@/components/Dialog/hooks/useNewDialog';
 import ButtonWithLoading from '@/components/common/ButtonWithLoading';
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/FindYourSize.tsx b/src/app/[locale]/(main)/products/[...params]/components/FindYourSize.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/FindYourSize.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/FindYourSize.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/GalleryItem.tsx b/src/app/[locale]/(main)/products/[...params]/components/GalleryItem.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/GalleryItem.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/GalleryItem.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/MobileBuyBox.tsx b/src/app/[locale]/(main)/products/[...params]/components/MobileBuyBox.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/MobileBuyBox.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/MobileBuyBox.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/ProductGallery.tsx b/src/app/[locale]/(main)/products/[...params]/components/ProductGallery.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/ProductGallery.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/ProductGallery.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/ProductTabs.tsx b/src/app/[locale]/(main)/products/[...params]/components/ProductTabs.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/ProductTabs.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/ProductTabs.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/components/SizeSelector.tsx b/src/app/[locale]/(main)/products/[...params]/components/SizeSelector.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/components/SizeSelector.tsx
rename to src/app/[locale]/(main)/products/[...params]/components/SizeSelector.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/contexts/productContext.ts b/src/app/[locale]/(main)/products/[...params]/contexts/productContext.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/contexts/productContext.ts
rename to src/app/[locale]/(main)/products/[...params]/contexts/productContext.ts
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/hooks/useProductContext.ts b/src/app/[locale]/(main)/products/[...params]/hooks/useProductContext.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/hooks/useProductContext.ts
rename to src/app/[locale]/(main)/products/[...params]/hooks/useProductContext.ts
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/loading.tsx b/src/app/[locale]/(main)/products/[...params]/loading.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/loading.tsx
rename to src/app/[locale]/(main)/products/[...params]/loading.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/page.tsx b/src/app/[locale]/(main)/products/[...params]/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/page.tsx
rename to src/app/[locale]/(main)/products/[...params]/page.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/[...params]/providers/ProductProvider.tsx b/src/app/[locale]/(main)/products/[...params]/providers/ProductProvider.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/[...params]/providers/ProductProvider.tsx
rename to src/app/[locale]/(main)/products/[...params]/providers/ProductProvider.tsx
diff --git a/src/app/[locale]/(main)/(container)/products/types/common.ts b/src/app/[locale]/(main)/products/types/common.ts
similarity index 100%
rename from src/app/[locale]/(main)/(container)/products/types/common.ts
rename to src/app/[locale]/(main)/products/types/common.ts
diff --git a/src/app/[locale]/(main)/(container)/search/components/SortRow.tsx b/src/app/[locale]/(main)/search/components/SortRow.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/search/components/SortRow.tsx
rename to src/app/[locale]/(main)/search/components/SortRow.tsx
diff --git a/src/app/[locale]/(main)/(container)/search/components/SortWrapper.tsx b/src/app/[locale]/(main)/search/components/SortWrapper.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/search/components/SortWrapper.tsx
rename to src/app/[locale]/(main)/search/components/SortWrapper.tsx
diff --git a/src/app/[locale]/(main)/(container)/search/loading.tsx b/src/app/[locale]/(main)/search/loading.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/search/loading.tsx
rename to src/app/[locale]/(main)/search/loading.tsx
diff --git a/src/app/[locale]/(main)/(container)/search/page.tsx b/src/app/[locale]/(main)/search/page.tsx
similarity index 100%
rename from src/app/[locale]/(main)/(container)/search/page.tsx
rename to src/app/[locale]/(main)/search/page.tsx
diff --git a/src/components/Header/components/TopBanner.tsx b/src/components/Header/components/TopBanner.tsx
index e58b339..6fa1497 100644
--- a/src/components/Header/components/TopBanner.tsx
+++ b/src/components/Header/components/TopBanner.tsx
@@ -1,4 +1,4 @@
-import { ISliderItem } from '@/app/[locale]/(main)/(container)/(homepage)/components/MainSlider/types';
+import { ISliderItem } from '@/app/[locale]/(main)/(homepage)/components/MainSlider/types';
 import Image from 'next/image';
 import React, { FC } from 'react';