diff --git a/packages/manager/apps/pci-object-storage/src/components/breadcrumb/Breadcrumb.component.tsx b/packages/manager/apps/pci-object-storage/src/components/breadcrumb/Breadcrumb.component.tsx
index d73558c3afb8..7209e08650e3 100644
--- a/packages/manager/apps/pci-object-storage/src/components/breadcrumb/Breadcrumb.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/breadcrumb/Breadcrumb.component.tsx
@@ -23,7 +23,7 @@ type BreadcrumbHandle = {
   }) => React.ReactElement | null;
 };
 
-function Breadcrumb(): JSX.Element {
+const Breadcrumb = (): JSX.Element => {
   const { projectId } = useParams();
   const { data: project } = usePciProject();
 
@@ -79,6 +79,6 @@ function Breadcrumb(): JSX.Element {
       ))}
     </>
   );
-}
+};
 
 export default Breadcrumb;
diff --git a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileList.component.tsx b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileList.component.tsx
index 43cb6775f61b..ea29925ac8ba 100644
--- a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileList.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileList.component.tsx
@@ -19,10 +19,10 @@ type Row<T> =
   | { type: RowType.folder; prefix: string }
   | { type: RowType.file; file: T };
 
-export function BrowserFileList<T extends { name: string }>({
+const BrowserFileList = <T extends { name: string }>({
   className,
   renderFileRow,
-}: BrowserFileListProps<T>) {
+}: BrowserFileListProps<T>) => {
   const {
     prefix,
     setPrefix,
@@ -137,4 +137,6 @@ export function BrowserFileList<T extends { name: string }>({
       )}
     </div>
   );
-}
+};
+
+export { BrowserFileList };
diff --git a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileListTopbar.component.tsx b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileListTopbar.component.tsx
index 738c52962638..b1298c8f8ca6 100644
--- a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileListTopbar.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserFileListTopbar.component.tsx
@@ -1,6 +1,6 @@
 import { useBrowser } from './BrowserRoot.component';
 
-export function BrowserFileListTopbar<T extends { name: string }>() {
+const BrowserFileListTopbar = <T extends { name: string }>() => {
   const { prefix } = useBrowser<T>();
   return (
     <div className="py-2 px-3 border-b bg-muted/50 text-sm shrink-0">
@@ -8,4 +8,6 @@ export function BrowserFileListTopbar<T extends { name: string }>() {
       <code className="font-mono">{prefix || '(root)'}</code>
     </div>
   );
-}
+};
+
+export { BrowserFileListTopbar };
diff --git a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserRoot.component.tsx b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserRoot.component.tsx
index cf6dd94a2588..47cc264605df 100644
--- a/packages/manager/apps/pci-object-storage/src/components/browser/BrowserRoot.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/browser/BrowserRoot.component.tsx
@@ -31,20 +31,20 @@ const BrowserContext = createContext<BrowserContextValue<{
   name: string;
 }> | null>(null);
 
-export function useBrowser<T extends { name: string }>() {
+const useBrowser = <T extends { name: string }>() => {
   const ctx = useContext(BrowserContext);
   if (!ctx) throw new Error('useBrowser must be used within <BrowserRoot>');
   return ctx as BrowserContextValue<T>;
-}
+};
 
-export function BrowserRoot<T extends NonNullable<unknown>>({
+const BrowserRoot = <T extends NonNullable<unknown>>({
   objects,
   keyField,
   getObjectKey,
   onDropFiles,
   onObjectClick,
   children,
-}: BrowserRootProps<T>) {
+}: BrowserRootProps<T>) => {
   const [prefix, setPrefix] = useState('');
   const contentScrollRef = useRef<HTMLDivElement>(null);
 
@@ -76,4 +76,6 @@ export function BrowserRoot<T extends NonNullable<unknown>>({
   return (
     <BrowserContext.Provider value={value}>{children}</BrowserContext.Provider>
   );
-}
+};
+
+export { BrowserRoot, useBrowser };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.component.tsx
index 132dbd1e5e33..bca8526f0bd3 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.component.tsx
@@ -15,13 +15,11 @@ import { useDataTableContext } from './DataTable.context';
 
 export const MENU_COLUMN_ID = 'actions_menu_column';
 
-interface DatatableProps<TData> {
+export interface DatatableProps<TData> {
   renderRowExpansion?: (row: TData) => ReactElement | null;
 }
 
-export function DataTable<TData>({
-  renderRowExpansion,
-}: DatatableProps<TData>) {
+const DataTable = <TData,>({ renderRowExpansion }: DatatableProps<TData>) => {
   const { table, rows } = useDataTableContext<TData>();
   const { t } = useTranslation('components/data-table');
   const [expandedRows, setExpandedRows] = useState<Record<string, boolean>>({});
@@ -115,4 +113,6 @@ export function DataTable<TData>({
       </TableBody>
     </Table>
   );
-}
+};
+
+export { DataTable };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.context.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.context.tsx
index 197cc0d67220..9c4644adbc7e 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.context.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DataTable.context.tsx
@@ -16,7 +16,7 @@ import { ColumnFilter } from './DatatableDefaultFilterButton.component';
 import { DataTable } from './DataTable.component';
 import { DataTablePagination } from './DatatablePagination.component';
 
-interface DataTableProviderProps<TData, TValue> {
+export interface DataTableProviderProps<TData, TValue> {
   columns: ColumnDef<TData, TValue>[];
   data: TData[];
   pageSize?: number;
@@ -39,13 +39,13 @@ interface DataTableContextValue<TData> {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const DataTableContext = createContext<DataTableContextValue<any> | null>(null);
 
-export function DataTableProvider<TData, TValue>({
+const DataTableProvider = <TData, TValue>({
   columns,
   data,
   pageSize,
   filtersDefinition,
   children,
-}: DataTableProviderProps<TData, TValue>) {
+}: DataTableProviderProps<TData, TValue>) => {
   const [sorting, setSorting] = useState<SortingState>([
     {
       id: columns[0]?.id || '',
@@ -110,9 +110,9 @@ export function DataTableProvider<TData, TValue>({
       )}
     </DataTableContext.Provider>
   );
-}
+};
 
-export function useDataTableContext<TData>() {
+const useDataTableContext = <TData,>() => {
   const context = useContext<DataTableContextValue<TData>>(DataTableContext);
   if (!context) {
     throw new Error(
@@ -120,4 +120,6 @@ export function useDataTableContext<TData>() {
     );
   }
   return context;
-}
+};
+
+export { DataTableProvider, useDataTableContext };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableAction.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableAction.component.tsx
index 1164c90e38a7..2c406e5583f5 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableAction.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableAction.component.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
 
-export function DatatableAction({ children }: { children: ReactNode }) {
-  return <>{children || <></>}</>;
-}
+const DatatableAction = ({ children }: { children: ReactNode }) => (
+  <>{children || <></>}</>
+);
+
+export { DatatableAction };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersButton.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersButton.component.tsx
index 59f189303719..9223c00b0b6f 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersButton.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersButton.component.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import { useDataTableContext } from './DataTable.context';
 import DataTableDefaultFilterButton from './DatatableDefaultFilterButton.component';
 
-export function DatatableFiltersButton({ children }: { children?: ReactNode }) {
+const DatatableFiltersButton = ({ children }: { children?: ReactNode }) => {
   const { filtersDefinition, columnFilters } = useDataTableContext();
   if (!filtersDefinition?.length) return <></>;
   return (
@@ -20,4 +20,6 @@ export function DatatableFiltersButton({ children }: { children?: ReactNode }) {
       )}
     </>
   );
-}
+};
+
+export { DatatableFiltersButton };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersList.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersList.component.tsx
index 34b63306cab3..475017fe2956 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersList.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableFiltersList.component.tsx
@@ -32,7 +32,7 @@ export type FilterListProps = {
   onRemoveFilter: (filter: FilterWithLabel) => void;
 };
 
-export function DatatableFiltersList() {
+const DatatableFiltersList = () => {
   const { t } = useTranslation('filters');
   const { columnFilters } = useDataTableContext();
   const locale = useLocale();
@@ -87,4 +87,6 @@ export function DatatableFiltersList() {
       ))}
     </div>
   );
-}
+};
+
+export { DatatableFiltersList };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableHeader.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableHeader.component.tsx
index a5e590db3e34..05694151979b 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableHeader.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableHeader.component.tsx
@@ -1,7 +1,7 @@
 import { Children, ReactElement, ReactNode } from 'react';
 import DataTable from './index';
 
-export function DatatableHeader({ children }: { children: ReactNode }) {
+const DatatableHeader = ({ children }: { children: ReactNode }) => {
   // Helper function to check if a child is a ReactElement
   const isReactElement = (child: ReactNode): child is ReactElement =>
     !!child && typeof child === 'object' && 'type' in child;
@@ -29,4 +29,6 @@ export function DatatableHeader({ children }: { children: ReactNode }) {
       </div>
     </div>
   );
-}
+};
+
+export { DatatableHeader };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatablePagination.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatablePagination.component.tsx
index 0f5993754048..f98fb2fe058d 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatablePagination.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatablePagination.component.tsx
@@ -15,7 +15,7 @@ import {
 } from '@datatr-ux/uxlib';
 import { useDataTableContext } from './DataTable.context';
 
-export function DataTablePagination() {
+const DataTablePagination = () => {
   const { t } = useTranslation('components/data-table');
   const { table } = useDataTableContext();
   const itemCount = table.getRowCount();
@@ -96,4 +96,6 @@ export function DataTablePagination() {
       </div>
     </div>
   );
-}
+};
+
+export { DataTablePagination };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSearchBar.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSearchBar.component.tsx
index a0a2c463fb93..e3817112e49f 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSearchBar.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSearchBar.component.tsx
@@ -4,7 +4,7 @@ import { Search } from 'lucide-react';
 import { Button, Input } from '@datatr-ux/uxlib';
 import { useDataTableContext } from './DataTable.context';
 
-export function DatatableSearchBar({ children }: { children?: ReactNode }) {
+const DatatableSearchBar = ({ children }: { children?: ReactNode }) => {
   const { t } = useTranslation('components/data-table');
   const { table, globalFilter } = useDataTableContext();
   return (
@@ -27,4 +27,6 @@ export function DatatableSearchBar({ children }: { children?: ReactNode }) {
       )}
     </>
   );
-}
+};
+
+export { DatatableSearchBar };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSkeleton.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSkeleton.component.tsx
index 0869c6949f0f..b59383d06edd 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSkeleton.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSkeleton.component.tsx
@@ -8,49 +8,49 @@ import {
   Skeleton,
 } from '@datatr-ux/uxlib';
 
-interface DataTableSkeletonProps {
+export interface DataTableSkeletonProps {
   rows?: number;
   columns?: number;
   height?: number;
   width?: number;
 }
-export function DatatableSkeleton({
+const DatatableSkeleton = ({
   height = 16,
   width = 80,
   rows = 5,
   columns = 5,
-}: DataTableSkeletonProps) {
-  return (
-    <Table data-testid="datatable.skeleton">
-      <TableHeader className="border bg-gray-50">
-        <TableRow>
-          {Array.from({ length: columns }).map((colHead, iColHead) => (
-            <TableHead
-              key={`${colHead}${iColHead}`}
-              className="border font-semibold text-primary-800"
-            >
+}: DataTableSkeletonProps) => (
+  <Table data-testid="datatable.skeleton">
+    <TableHeader className="border bg-gray-50">
+      <TableRow>
+        {Array.from({ length: columns }).map((colHead, iColHead) => (
+          <TableHead
+            key={`${colHead}${iColHead}`}
+            className="border font-semibold text-primary-800"
+          >
+            <Skeleton
+              className="block"
+              style={{ width: `${width}px`, height: `${height}px` }}
+            />
+          </TableHead>
+        ))}
+      </TableRow>
+    </TableHeader>
+    <TableBody className="border border-primary-100">
+      {Array.from({ length: rows }).map((row, iRow) => (
+        <TableRow key={`${row}${iRow}`}>
+          {Array.from({ length: columns }).map((col, iCol) => (
+            <TableCell key={`${col}${iCol}`}>
               <Skeleton
                 className="block"
                 style={{ width: `${width}px`, height: `${height}px` }}
               />
-            </TableHead>
+            </TableCell>
           ))}
         </TableRow>
-      </TableHeader>
-      <TableBody className="border border-primary-100">
-        {Array.from({ length: rows }).map((row, iRow) => (
-          <TableRow key={`${row}${iRow}`}>
-            {Array.from({ length: columns }).map((col, iCol) => (
-              <TableCell key={`${col}${iCol}`}>
-                <Skeleton
-                  className="block"
-                  style={{ width: `${width}px`, height: `${height}px` }}
-                />
-              </TableCell>
-            ))}
-          </TableRow>
-        ))}
-      </TableBody>
-    </Table>
-  );
-}
+      ))}
+    </TableBody>
+  </Table>
+);
+
+export { DatatableSkeleton };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSortableHeader.component.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSortableHeader.component.tsx
index aa19f18edeff..d87dc2101fb3 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSortableHeader.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/DatatableSortableHeader.component.tsx
@@ -3,14 +3,14 @@ import { SortingColumn } from '@tanstack/react-table';
 import { Button } from '@datatr-ux/uxlib';
 import { cn } from '@/lib/utils';
 
-interface SortableHeaderProps<TData> {
+export interface SortableHeaderProps<TData> {
   column: SortingColumn<TData>;
   children: React.ReactNode;
 }
-export function DatatableSortableHeader<TData>({
+const DatatableSortableHeader = <TData,>({
   column,
   children,
-}: SortableHeaderProps<TData>) {
+}: SortableHeaderProps<TData>) => {
   const sort = column.getIsSorted();
   let icon = <ChevronsUpDown className="ml-2 h-4 w-4" />;
   if (sort === 'asc') {
@@ -34,4 +34,6 @@ export function DatatableSortableHeader<TData>({
       {icon}
     </Button>
   );
-}
+};
+
+export { DatatableSortableHeader };
diff --git a/packages/manager/apps/pci-object-storage/src/components/data-table/useColumnFilters.hook.tsx b/packages/manager/apps/pci-object-storage/src/components/data-table/useColumnFilters.hook.tsx
index f9bcda9b1cb3..7b6c88d627de 100644
--- a/packages/manager/apps/pci-object-storage/src/components/data-table/useColumnFilters.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/data-table/useColumnFilters.hook.tsx
@@ -5,7 +5,7 @@ import { FilterWithLabel } from './DatatableFiltersList.component';
 const filterEquals = (a: Filter, b: Filter) =>
   a.key === b.key && a.value === b.value && a.comparator === b.comparator;
 
-export function useColumnFilters() {
+const useColumnFilters = () => {
   const [filters, setFilters] = useState<FilterWithLabel[]>([]);
 
   return {
@@ -29,4 +29,6 @@ export function useColumnFilters() {
       );
     },
   };
-}
+};
+
+export { useColumnFilters };
diff --git a/packages/manager/apps/pci-object-storage/src/components/form-field/FormField.component.tsx b/packages/manager/apps/pci-object-storage/src/components/form-field/FormField.component.tsx
index b17a9a485b12..bc62b0ea7702 100644
--- a/packages/manager/apps/pci-object-storage/src/components/form-field/FormField.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/form-field/FormField.component.tsx
@@ -14,21 +14,21 @@ interface FormFieldProps<T extends FieldValues, K extends Path<T>> {
   children: (field: ControllerRenderProps<T, K>) => ReactNode;
 }
 
-export function FormField<T extends FieldValues, K extends Path<T>>({
+const FormField = <T extends FieldValues, K extends Path<T>>({
   form,
   name,
   children,
-}: FormFieldProps<T, K>) {
-  return (
-    <Controller
-      control={form.control}
-      name={name}
-      render={({ field, fieldState }) => (
-        <Field data-invalid={fieldState.invalid}>
-          <FieldContent>{children(field)}</FieldContent>
-          {fieldState.invalid && <FieldError errors={[fieldState.error]} />}
-        </Field>
-      )}
-    />
-  );
-}
+}: FormFieldProps<T, K>) => (
+  <Controller
+    control={form.control}
+    name={name}
+    render={({ field, fieldState }) => (
+      <Field data-invalid={fieldState.invalid}>
+        <FieldContent>{children(field)}</FieldContent>
+        {fieldState.invalid && <FieldError errors={[fieldState.error]} />}
+      </Field>
+    )}
+  />
+);
+
+export { FormField };
diff --git a/packages/manager/apps/pci-object-storage/src/components/links/A.component.tsx b/packages/manager/apps/pci-object-storage/src/components/links/A.component.tsx
index fadd9f43be6d..dce772daac52 100644
--- a/packages/manager/apps/pci-object-storage/src/components/links/A.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/links/A.component.tsx
@@ -1,11 +1,11 @@
 import { cn } from '@/lib/utils';
 
-function A({
+const A = ({
   className,
   children,
   disabled,
   ...props
-}: React.AnchorHTMLAttributes<HTMLAnchorElement> & { disabled?: boolean }) {
+}: React.AnchorHTMLAttributes<HTMLAnchorElement> & { disabled?: boolean }) => {
   const baseClassName =
     'text-primary-500 font-semibold outiline-none cursor-pointer no-underline hover:text-primary-700 hover:underline';
   const disabledClass = 'opacity-50 cursor-not-allowed hover:text-primary-500';
@@ -34,5 +34,5 @@ function A({
       {children}
     </a>
   );
-}
+};
 export default A;
diff --git a/packages/manager/apps/pci-object-storage/src/components/links/ConditionalLink.component.tsx b/packages/manager/apps/pci-object-storage/src/components/links/ConditionalLink.component.tsx
index d0beee24fe26..08f0991700bb 100644
--- a/packages/manager/apps/pci-object-storage/src/components/links/ConditionalLink.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/links/ConditionalLink.component.tsx
@@ -7,13 +7,13 @@ interface ConditionalLinkProps extends LinkProps {
   disabled?: boolean;
 }
 
-function ConditionalLink({
+const ConditionalLink = ({
   condition,
   className,
   children,
   to,
   ...props
-}: ConditionalLinkProps) {
+}: ConditionalLinkProps) => {
   if (condition) {
     return (
       <Link to={to} className={className} {...props}>
@@ -23,6 +23,6 @@ function ConditionalLink({
   }
 
   return <div className={className}>{children}</div>;
-}
+};
 
 export default ConditionalLink;
diff --git a/packages/manager/apps/pci-object-storage/src/components/links/Link.component.tsx b/packages/manager/apps/pci-object-storage/src/components/links/Link.component.tsx
index 21ac9352e5b0..a95cf629143a 100644
--- a/packages/manager/apps/pci-object-storage/src/components/links/Link.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/links/Link.component.tsx
@@ -2,13 +2,13 @@ import { LinkProps, Link as RouterLink } from 'react-router-dom';
 import { cn } from '@/lib/utils';
 import { useLoadingIndicatorContext } from '@/contexts/LoadingIndicator.context';
 
-function Link({
+const Link = ({
   className,
   disabled,
   children,
   to,
   ...props
-}: LinkProps & { disabled?: boolean }) {
+}: LinkProps & { disabled?: boolean }) => {
   const { setLoading } = useLoadingIndicatorContext();
   const baseClassName =
     'text-primary-500 font-semibold outiline-none cursor-pointer no-underline hover:text-primary-700 hover:underline';
@@ -34,6 +34,6 @@ function Link({
       {children}
     </RouterLink>
   );
-}
+};
 
 export default Link;
diff --git a/packages/manager/apps/pci-object-storage/src/components/links/NavLink.component.tsx b/packages/manager/apps/pci-object-storage/src/components/links/NavLink.component.tsx
index 85ed1be61a01..f1d3cd0a17e0 100644
--- a/packages/manager/apps/pci-object-storage/src/components/links/NavLink.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/links/NavLink.component.tsx
@@ -2,14 +2,14 @@ import { NavLink as RouterNavLink, NavLinkProps } from 'react-router-dom';
 import { cn } from '@/lib/utils';
 import { useLoadingIndicatorContext } from '@/contexts/LoadingIndicator.context';
 
-function NavLink({
+const NavLink = ({
   className,
   disabled,
   children,
   to,
   end,
   ...props
-}: NavLinkProps & { disabled?: boolean }) {
+}: NavLinkProps & { disabled?: boolean }) => {
   const { setLoading } = useLoadingIndicatorContext();
   const baseClassName =
     'whitespace-nowrap w-fit text-primary-500 text-base font-semibold m-0 py-2 hover:text-primary-700 cursor-pointer no-underline';
@@ -40,6 +40,6 @@ function NavLink({
       {children}
     </RouterNavLink>
   );
-}
+};
 
 export default NavLink;
diff --git a/packages/manager/apps/pci-object-storage/src/components/links/OvhLink.component.tsx b/packages/manager/apps/pci-object-storage/src/components/links/OvhLink.component.tsx
index 541426114437..e48610483e05 100644
--- a/packages/manager/apps/pci-object-storage/src/components/links/OvhLink.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/links/OvhLink.component.tsx
@@ -7,14 +7,14 @@ interface OvhLinkProps {
   path: string;
   params?: Record<string, string | number | boolean>;
 }
-function OvhLink({
+const OvhLink = ({
   application,
   path,
   params = {},
   children,
   ...props
 }: React.AnchorHTMLAttributes<HTMLAnchorElement> &
-  OvhLinkProps & { disabled?: boolean }) {
+  OvhLinkProps & { disabled?: boolean }) => {
   const navigation = useNavigation();
   const [url, setUrl] = React.useState('');
   React.useEffect(() => {
@@ -33,6 +33,6 @@ function OvhLink({
       {children}
     </A>
   );
-}
+};
 
 export default OvhLink;
diff --git a/packages/manager/apps/pci-object-storage/src/components/loading/Loading.component.tsx b/packages/manager/apps/pci-object-storage/src/components/loading/Loading.component.tsx
index 33c117880345..3c95a5baae69 100644
--- a/packages/manager/apps/pci-object-storage/src/components/loading/Loading.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/loading/Loading.component.tsx
@@ -1,14 +1,14 @@
 import { Loader2 } from 'lucide-react';
 
-export default function Loading() {
-  return (
-    <div className="flex justify-center" data-testid="loading-container">
-      <div>
-        <Loader2
-          data-testid="osds-spinner"
-          className="w-16 h-16 my-20 animate-spin"
-        />
-      </div>
+const Loading = () => (
+  <div className="flex justify-center" data-testid="loading-container">
+    <div>
+      <Loader2
+        data-testid="osds-spinner"
+        className="w-16 h-16 my-20 animate-spin"
+      />
     </div>
-  );
-}
+  </div>
+);
+
+export default Loading;
diff --git a/packages/manager/apps/pci-object-storage/src/components/loading/ProgressLoader.component.tsx b/packages/manager/apps/pci-object-storage/src/components/loading/ProgressLoader.component.tsx
index 7e0cca660f09..3af9ac369210 100644
--- a/packages/manager/apps/pci-object-storage/src/components/loading/ProgressLoader.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/loading/ProgressLoader.component.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 
-export default function ProgressLoader() {
+const ProgressLoader = () => {
   const [progress, setProgress] = useState(0);
 
   useEffect(() => {
@@ -32,4 +32,6 @@ export default function ProgressLoader() {
       ></div>
     </div>
   );
-}
+};
+
+export default ProgressLoader;
diff --git a/packages/manager/apps/pci-object-storage/src/components/refresh-button/RefreshButton.component.tsx b/packages/manager/apps/pci-object-storage/src/components/refresh-button/RefreshButton.component.tsx
index e9ea00a1883b..8f06d751e08f 100644
--- a/packages/manager/apps/pci-object-storage/src/components/refresh-button/RefreshButton.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/refresh-button/RefreshButton.component.tsx
@@ -6,18 +6,15 @@ interface RefreshButtonProps {
   isLoading: boolean;
 }
 
-export default function RefreshButton({
-  onClick,
-  isLoading,
-}: RefreshButtonProps) {
-  return (
-    <Button
-      mode="outline"
-      className="h-10 px-4"
-      onClick={onClick}
-      disabled={isLoading}
-    >
-      <RefreshCw className={`size-4 ${isLoading ? 'animate-spin' : ''}`} />
-    </Button>
-  );
-}
+const RefreshButton = ({ onClick, isLoading }: RefreshButtonProps) => (
+  <Button
+    mode="outline"
+    className="h-10 px-4"
+    onClick={onClick}
+    disabled={isLoading}
+  >
+    <RefreshCw className={`size-4 ${isLoading ? 'animate-spin' : ''}`} />
+  </Button>
+);
+
+export default RefreshButton;
diff --git a/packages/manager/apps/pci-object-storage/src/components/route-sheet/RouteSheet.component.tsx b/packages/manager/apps/pci-object-storage/src/components/route-sheet/RouteSheet.component.tsx
index 2b1817cfe9be..7fc83422431e 100644
--- a/packages/manager/apps/pci-object-storage/src/components/route-sheet/RouteSheet.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/route-sheet/RouteSheet.component.tsx
@@ -50,4 +50,4 @@ const RouteSheet = ({
   );
 };
 
-export default RouteSheet;
\ No newline at end of file
+export default RouteSheet;
diff --git a/packages/manager/apps/pci-object-storage/src/components/tabs-menu/TabsMenu.component.tsx b/packages/manager/apps/pci-object-storage/src/components/tabs-menu/TabsMenu.component.tsx
index 304eda6c4e91..3d953235030e 100644
--- a/packages/manager/apps/pci-object-storage/src/components/tabs-menu/TabsMenu.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/tabs-menu/TabsMenu.component.tsx
@@ -57,7 +57,7 @@ const TabsMenu = ({ tabs }: TabsMenuProps) => {
   );
 };
 
-TabsMenu.Skeleton = function TabsMenuSkeleton() {
+TabsMenu.Skeleton = () => {
   return (
     <div
       className="relative flex overflow-x-auto mb-4 w-full border-b border-gray-100"
diff --git a/packages/manager/apps/pci-object-storage/src/components/virtualized-browser/VirtualizedBrowser.component.tsx b/packages/manager/apps/pci-object-storage/src/components/virtualized-browser/VirtualizedBrowser.component.tsx
index 20d9a61d3fdc..cdc97926839c 100644
--- a/packages/manager/apps/pci-object-storage/src/components/virtualized-browser/VirtualizedBrowser.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/components/virtualized-browser/VirtualizedBrowser.component.tsx
@@ -20,7 +20,7 @@ interface VirtualizedBrowserProps<T> {
   isFetching?: boolean; // Whether the query is currently fetching (for initial loads/searches)
 }
 
-export function VirtualizedBrowser<T>({
+const VirtualizedBrowser = <T,>({
   items,
   hasNextPage,
   isFetchingNextPage,
@@ -34,7 +34,7 @@ export function VirtualizedBrowser<T>({
   preloadThreshold = VIRTUALIZED_BROWSER.DEFAULT_PRELOAD_THRESHOLD,
   onDropFiles,
   isFetching = false,
-}: VirtualizedBrowserProps<T>) {
+}: VirtualizedBrowserProps<T>) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const parentRef = useRef<HTMLDivElement>(null);
   const [isDragOver, setIsDragOver] = useState(false);
@@ -171,4 +171,6 @@ export function VirtualizedBrowser<T>({
       </div>
     </div>
   );
-}
+};
+
+export { VirtualizedBrowser };
diff --git a/packages/manager/apps/pci-object-storage/src/configuration/region.const.ts b/packages/manager/apps/pci-object-storage/src/configuration/region.const.ts
index 54d11b625b70..2231f0a406b0 100644
--- a/packages/manager/apps/pci-object-storage/src/configuration/region.const.ts
+++ b/packages/manager/apps/pci-object-storage/src/configuration/region.const.ts
@@ -1,8 +1,7 @@
-                                                                                                                             
-  export enum Region3AZ {                                                                                                    
-    PARIS = 'EU-WEST-PAR',                                                                                                   
-    MILAN = 'EU-SOUTH-MIL',                                                                                                  
-  }                                                                                                                          
-                                                                                                                             
-  export const COLD_ARCHIVE_REGIONS: readonly string[] = [Region3AZ.PARIS];                                                  
-  export const GLACIER_IR_REGIONS: readonly string[] = Object.values(Region3AZ);     
\ No newline at end of file
+export enum Region3AZ {
+  PARIS = 'EU-WEST-PAR',
+  MILAN = 'EU-SOUTH-MIL',
+}
+
+export const COLD_ARCHIVE_REGIONS: readonly string[] = [Region3AZ.PARIS];
+export const GLACIER_IR_REGIONS: readonly string[] = Object.values(Region3AZ);
diff --git a/packages/manager/apps/pci-object-storage/src/data/hooks/s3-storage/useS3ObjectsBrowser.hook.tsx b/packages/manager/apps/pci-object-storage/src/data/hooks/s3-storage/useS3ObjectsBrowser.hook.tsx
index 32bbcc83845d..2b24ee2b9a17 100644
--- a/packages/manager/apps/pci-object-storage/src/data/hooks/s3-storage/useS3ObjectsBrowser.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/data/hooks/s3-storage/useS3ObjectsBrowser.hook.tsx
@@ -2,12 +2,12 @@ import { useMemo } from 'react';
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { cloud } from '@datatr-ux/ovhcloud-types';
 import { apiClient } from '@/data/api/api.client';
-import { OBJECTS_PAGE } from '@/pages/object-storage/storage/s3Id/objects/objects.constants';
+import { OBJECTS_PAGE } from '@/pages/object-storage/s3/[region]/[s3Name]/objects/objects.constants';
 
 type StorageObject = cloud.StorageObject & { isCommonPrefix: boolean };
 
 export type S3BrowserItem =
-  { type: 'parent' }
+  | { type: 'parent' }
   | {
       type: 'folder';
       key: string; // ex: "new_object/"
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useAvailableStorageClasses.hook.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useAvailableStorageClasses.hook.tsx
index 8e3b647eaa09..65a72ebcfd34 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useAvailableStorageClasses.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useAvailableStorageClasses.hook.tsx
@@ -8,12 +8,13 @@ import {
 } from '@/configuration/region.const';
 import { useFeatureAvailability } from '@ovh-ux/manager-module-common-api';
 
-export function useAvailableStorageClasses(region: string) {
+const useAvailableStorageClasses = (region: string) => {
   const { data: featuresAvailable } = useFeatureAvailability([
     'pci-object-storage:storage-class-active-archive',
   ]);
 
-  const isActiveArchiveFeatureAvailable = featuresAvailable?.['pci-object-storage:storage-class-active-archive'];
+  const isActiveArchiveFeatureAvailable =
+    featuresAvailable?.['pci-object-storage:storage-class-active-archive'];
   const { projectId } = useParams();
   const regionQuery = useGetRegions(projectId);
 
@@ -39,7 +40,9 @@ export function useAvailableStorageClasses(region: string) {
         return COLD_ARCHIVE_REGIONS.includes(s3Region.name);
 
       case storages.StorageClassEnum.GLACIER_IR:
-        return isActiveArchiveFeatureAvailable ? GLACIER_IR_REGIONS.includes(s3Region.name) : false;
+        return isActiveArchiveFeatureAvailable
+          ? GLACIER_IR_REGIONS.includes(s3Region.name)
+          : false;
 
       case storages.StorageClassEnum.HIGH_PERF:
         return regionType !== RegionTypeEnum['region-3-az'];
@@ -56,4 +59,6 @@ export function useAvailableStorageClasses(region: string) {
     availableStorageClasses,
     isPending: regionQuery.isPending,
   };
-}
+};
+
+export { useAvailableStorageClasses };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useDateFnsLocale.hook.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useDateFnsLocale.hook.tsx
index 644be4c3a915..57112bc1d1d9 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useDateFnsLocale.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useDateFnsLocale.hook.tsx
@@ -1,7 +1,7 @@
 import { fr, de, enGB, es, frCA, it, pl, pt } from 'date-fns/locale';
 import { Locale, useLocale } from '@/hooks/useLocale';
 
-export function useDateFnsLocale() {
+const useDateFnsLocale = () => {
   const locale = useLocale();
   switch (locale) {
     case Locale.fr_FR:
@@ -23,4 +23,6 @@ export function useDateFnsLocale() {
     default:
       return enGB;
   }
-}
+};
+
+export { useDateFnsLocale };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useDebounce.hook.ts b/packages/manager/apps/pci-object-storage/src/hooks/useDebounce.hook.ts
index 387afec8d9bb..0b76d3ffd635 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useDebounce.hook.ts
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useDebounce.hook.ts
@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react';
  * @param delay - Delay in milliseconds (default: 300)
  * @returns The debounced value
  */
-export function useDebounce<T>(value: T, delay = 300): T {
+const useDebounce = <T>(value: T, delay = 300): T => {
   const [debouncedValue, setDebouncedValue] = useState<T>(value);
 
   useEffect(() => {
@@ -20,4 +20,6 @@ export function useDebounce<T>(value: T, delay = 300): T {
   }, [value, delay]);
 
   return debouncedValue;
-}
+};
+
+export { useDebounce };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useImmediateRefetch.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useImmediateRefetch.tsx
index 679400cc21ee..2802ee5abed4 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useImmediateRefetch.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useImmediateRefetch.tsx
@@ -19,14 +19,14 @@ export type OptionsFor<
   'queryKey' | 'queryFn'
 >;
 
-export function useQueryImmediateRefetch<T>({
+const useQueryImmediateRefetch = <T,>({
   queryKey,
   queryFn,
   ...options
 }: {
   queryKey: unknown[];
   queryFn: () => Promise<T>;
-} & Omit<UseQueryOptions<T, Error, T, QueryKey>, 'queryKey' | 'queryFn'>) {
+} & Omit<UseQueryOptions<T, Error, T, QueryKey>, 'queryKey' | 'queryFn'>) => {
   const prevRefetchInterval = useRef(options?.refetchInterval);
   const query = useQuery({
     queryKey,
@@ -44,4 +44,6 @@ export function useQueryImmediateRefetch<T>({
     prevRefetchInterval.current = options?.refetchInterval;
   }, [options?.refetchInterval, queryKey, options?.enabled, query]);
   return query;
-}
+};
+
+export { useQueryImmediateRefetch };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useIs3AZ.hook.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useIs3AZ.hook.tsx
index 3f87ce09379a..532ce6f72d97 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useIs3AZ.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useIs3AZ.hook.tsx
@@ -4,10 +4,12 @@ import {
   StorageContainer,
 } from '@datatr-ux/ovhcloud-types/cloud';
 
-export function useIs3AZ(s3: StorageContainer, regions: Region[]) {
+const useIs3AZ = (s3: StorageContainer, regions: Region[]) => {
   if (!regions) return true;
   return (
     regions.find((reg) => reg.name === s3.region).type ===
     RegionTypeEnum['region-3-az']
   );
-}
+};
+
+export { useIs3AZ };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useIsLocalZone.hook.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useIsLocalZone.hook.tsx
index 69efb5ac17c9..70649b5617c8 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useIsLocalZone.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useIsLocalZone.hook.tsx
@@ -4,10 +4,12 @@ import {
   StorageContainer,
 } from '@datatr-ux/ovhcloud-types/cloud';
 
-export function useIsLocaleZone(s3: StorageContainer, regions: Region[]) {
+const useIsLocaleZone = (s3: StorageContainer, regions: Region[]) => {
   if (!regions) return true;
   return (
     regions.find((reg) => reg.name === s3.region).type ===
     RegionTypeEnum.localzone
   );
-}
+};
+
+export { useIsLocaleZone };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useLocale.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useLocale.tsx
index 142d7c3b2d1c..0a70ebf101c2 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useLocale.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useLocale.tsx
@@ -16,7 +16,7 @@ export enum Locale {
  * Fetches and keep synced the current locale
  * @returns The current locale string
  */
-export function useLocale() {
+const useLocale = () => {
   const shellCtx = useShell();
   const [locale, setLocale] = useState<Locale>(Locale.fr_FR);
   // fetch initial locale
@@ -32,4 +32,6 @@ export function useLocale() {
     setLocale(newLocale as Locale);
   });
   return locale;
-}
+};
+
+export { useLocale };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useLocaleByteConverter.hook.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useLocaleByteConverter.hook.tsx
index 46b412a52a12..b56abd66cb0a 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useLocaleByteConverter.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useLocaleByteConverter.hook.tsx
@@ -1,7 +1,7 @@
 import { useLocale } from '@/hooks/useLocale';
 import { bytesConverter, octetConverter } from '@/lib/bytesHelper';
 
-export function useLocaleBytesConverter() {
+const useLocaleBytesConverter = () => {
   const locale = useLocale();
 
   const converter = (value: number, si = false, dp = 1) => {
@@ -12,4 +12,6 @@ export function useLocaleBytesConverter() {
   };
 
   return converter;
-}
+};
+
+export { useLocaleBytesConverter };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useTracking.ts b/packages/manager/apps/pci-object-storage/src/hooks/useTracking.ts
index eca8472c48c8..a308d22f9adf 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useTracking.ts
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useTracking.ts
@@ -9,7 +9,7 @@ import usePciProject from '@/data/hooks/project/usePciProject.hook';
 import { PlanCode } from '@/configuration/project';
 
 // Set the project mode, needed to track discovery actions
-function useProjectModeTracking() {
+const useProjectModeTracking = () => {
   const { shell } = useContext(ShellContext);
   const { setPciProjectMode } = shell.tracking;
   const { data: project } = usePciProject();
@@ -21,11 +21,11 @@ function useProjectModeTracking() {
       });
     }
   }, [project]);
-}
+};
 
 // Provide a function to track actions with the correct
 // type and level
-export function useTrackAction() {
+const useTrackAction = () => {
   useProjectModeTracking();
   const { shell } = useContext(ShellContext);
   const { trackClick } = shell.tracking;
@@ -37,10 +37,10 @@ export function useTrackAction() {
       level2: PCI_LEVEL2,
     });
   };
-}
+};
 
 // Fire a page tracking event when landing on the page
-export function useTrackPage(pageTracking: string) {
+const useTrackPage = (pageTracking: string) => {
   useProjectModeTracking();
   const { shell } = useContext(ShellContext);
   const { trackPage } = shell.tracking;
@@ -50,9 +50,9 @@ export function useTrackPage(pageTracking: string) {
       level2: PCI_LEVEL2,
     });
   }, []);
-}
+};
 
-export function useTrackPageAuto() {
+const useTrackPageAuto = () => {
   useProjectModeTracking();
   const { shell } = useContext(ShellContext);
   const { trackPage } = shell.tracking;
@@ -85,4 +85,6 @@ export function useTrackPageAuto() {
   useEffect(() => {
     hasTrackedRef.current = false;
   }, [location.pathname]);
-}
+};
+
+export { useTrackAction, useTrackPage, useTrackPageAuto };
diff --git a/packages/manager/apps/pci-object-storage/src/hooks/useUser.tsx b/packages/manager/apps/pci-object-storage/src/hooks/useUser.tsx
index 8f4f4f3ab7ac..2bf411ab4e29 100644
--- a/packages/manager/apps/pci-object-storage/src/hooks/useUser.tsx
+++ b/packages/manager/apps/pci-object-storage/src/hooks/useUser.tsx
@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react';
  * Fetches the current user
  * @returns The current user
  */
-export function useUser() {
+const useUser = () => {
   const shellCtx = useShell();
   const [user, setUser] = useState<User>();
   // fetch initial user
@@ -18,4 +18,6 @@ export function useUser() {
     fetchUser();
   }, [shellCtx.environment]);
   return user;
-}
+};
+
+export { useUser };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/404.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/404.page.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/404.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/404.page.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/404.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/404.page.tsx
index beecd398a723..bce658fc1685 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/404.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/404.page.tsx
@@ -1,3 +1,3 @@
-export default function NotFound() {
-  return <h1>404 - route not found</h1>;
-}
+const NotFound = () => <h1>404 - route not found</h1>;
+
+export default NotFound;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.spec.tsx
index f5ab38c395d2..4adde9080b9d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.spec.tsx
@@ -17,7 +17,7 @@ import {
 } from '@/__tests__/helpers/mocks/cloudUser/user';
 import { openButtonInMenu } from '@/__tests__/helpers/unitTestHelper';
 import { mockedUsedNavigate } from '@/__tests__/helpers/mockRouterDomHelper';
-import StoragesList from './_components/StorageListTable.component';
+import StoragesList from './_components/storages/StorageListTable.component';
 import { FormattedStorage, ObjectStorageTypeEnum } from '@/types/Storages';
 
 const mockedSwitftStorage: FormattedStorage = {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.tsx
new file mode 100644
index 000000000000..75b0cf080c0a
--- /dev/null
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ListObjectStorages.page.tsx
@@ -0,0 +1,16 @@
+import { Outlet } from 'react-router-dom';
+import StoragesList from './_components/storages/StorageListTable.component';
+import { useObjectStorageData } from './ObjectStorage.context';
+
+const ListObjectStorages = () => {
+  const { storages } = useObjectStorageData();
+
+  return (
+    <>
+      <StoragesList storages={storages || []} />
+      <Outlet />
+    </>
+  );
+};
+
+export default ListObjectStorages;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.tsx
index 7e424b04db15..2fe0e347ad24 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/ObjectStorage.layout.tsx
@@ -6,7 +6,7 @@ import { useUserActivityContext } from '@/contexts/UserActivityContext';
 import { useGetStorages } from '@/data/hooks/storage/useGetStorages.hook';
 import { useGetUsers } from '@/data/hooks/user/useGetUsers.hook';
 import { POLLING } from '@/configuration/polling.constants';
-import StoragesList from './storage/_components/StorageListTable.component';
+import StoragesList from './_components/storages/StorageListTable.component';
 import TabsMenu from '@/components/tabs-menu/TabsMenu.component';
 import { useGetRegions } from '@/data/hooks/region/useGetRegions.hook';
 import queryClient from '@/query.client';
@@ -37,7 +37,7 @@ export const Loader = ({ params }: ObjectStorageProps) => {
     });
 };
 
-export default function DashboardLayout() {
+const ObjectStorage = () => {
   const { t } = useTranslation('pci-object-storage');
   const { isUserActive } = useUserActivityContext();
   const { projectId } = useParams();
@@ -85,4 +85,6 @@ export default function DashboardLayout() {
       </div>
     </>
   );
-}
+};
+
+export default ObjectStorage;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/Root.layout.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.spec.tsx
similarity index 93%
rename from packages/manager/apps/pci-object-storage/src/pages/Root.layout.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.spec.tsx
index 2a588f75e53c..15d1d3197ae5 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/Root.layout.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.spec.tsx
@@ -1,6 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
-import Layout, { breadcrumb as Breadcrumb, Loader } from '@/pages/Root.layout';
+import Layout, {
+  breadcrumb as Breadcrumb,
+  Loader,
+} from '@/pages/object-storage/Root.layout';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import * as projectAPI from '@/data/api/project/project.api';
 
diff --git a/packages/manager/apps/pci-object-storage/src/pages/Root.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.tsx
similarity index 81%
rename from packages/manager/apps/pci-object-storage/src/pages/Root.layout.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.tsx
index 577bb0e340a4..4525babc849b 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/Root.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/Root.layout.tsx
@@ -14,14 +14,12 @@ import { getProject } from '@/data/api/project/project.api';
 import { UserActivityProvider } from '@/contexts/UserActivityContext';
 import { USER_INACTIVITY_TIMEOUT } from '@/configuration/polling.constants';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey={'crumb-object-storage'}
-      namespace="pci-object-storage"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey={'crumb-object-storage'}
+    namespace="pci-object-storage"
+  />
+);
 
 interface ServiceCategoryLayoutProps {
   params: {
@@ -45,7 +43,7 @@ export const Loader = ({ params }: ServiceCategoryLayoutProps) => {
     );
 };
 
-function RoutingSynchronisation() {
+const RoutingSynchronisation = () => {
   const { setLoading } = useLoadingIndicatorContext();
   const location = useLocation();
   const routing = useRouting();
@@ -70,17 +68,18 @@ function RoutingSynchronisation() {
   useTrackPageAuto();
 
   return <></>;
-}
+};
 
-export default function Layout() {
-  return (
-    <PageLayout>
-      <UserActivityProvider timeout={USER_INACTIVITY_TIMEOUT}>
-        <Breadcrumb />
-        <RoutingSynchronisation />
-        <Outlet />
-        <Toaster />
-      </UserActivityProvider>
-    </PageLayout>
-  );
-}
+const Root = () => (
+  <PageLayout>
+    <UserActivityProvider timeout={USER_INACTIVITY_TIMEOUT}>
+      <Breadcrumb />
+      <RoutingSynchronisation />
+      <Outlet />
+      <Toaster />
+    </UserActivityProvider>
+  </PageLayout>
+);
+
+export { breadcrumb };
+export default Root;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/DeleteS3.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/DeleteS3.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/DeleteS3.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/DeleteS3.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/DeleteSwift.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/DeleteSwift.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/DeleteSwift.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/DeleteSwift.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListColumns.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListColumns.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListColumns.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListColumns.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListFilters.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListFilters.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListFilters.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListFilters.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListTable.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListTable.component.tsx
similarity index 81%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListTable.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListTable.component.tsx
index dee5a74d51ba..ed0ed07070e7 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/_components/StorageListTable.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/_components/storages/StorageListTable.component.tsx
@@ -12,7 +12,7 @@ interface StoragesListProps {
   storages: FormattedStorage[];
 }
 
-export default function StoragesList({ storages }: StoragesListProps) {
+const StoragesList = ({ storages }: StoragesListProps) => {
   const { t } = useTranslation('pci-object-storage/storages');
   const navigate = useNavigate();
   const columns: ColumnDef<FormattedStorage>[] = useGetColumns({
@@ -66,22 +66,22 @@ export default function StoragesList({ storages }: StoragesListProps) {
       <DataTable.Pagination />
     </DataTable.Provider>
   );
-}
+};
 
-StoragesList.Skeleton = function StoragesListSkeleton() {
-  return (
-    <>
-      <div
-        data-testid="service-list-table-skeleton"
-        className="flex justify-between w-100 mb-2 items-end"
-      >
+StoragesList.Skeleton = () => (
+  <>
+    <div
+      data-testid="service-list-table-skeleton"
+      className="flex justify-between w-100 mb-2 items-end"
+    >
+      <Skeleton className="h-10 w-48" />
+      <div className="flex">
         <Skeleton className="h-10 w-48" />
-        <div className="flex">
-          <Skeleton className="h-10 w-48" />
-          <Skeleton className="h-10 w-12 ml-2" />
-        </div>
+        <Skeleton className="h-10 w-12 ml-2" />
       </div>
-      <DataTable.Skeleton columns={5} rows={10} width={100} height={16} />
-    </>
-  );
-};
+    </div>
+    <DataTable.Skeleton columns={5} rows={10} width={100} height={16} />
+  </>
+);
+
+export default StoragesList;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.modal.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.modal.tsx
index 1df870f6ff28..e35640fb3f09 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.modal.tsx
@@ -30,7 +30,7 @@ import RouteModal from '@/components/route-modal/RouteModal';
 import storages from '@/types/Storages';
 import { getObjectStoreApiErrorMessage } from '@/lib/apiHelper';
 import { useGetS3 } from '@/data/hooks/s3-storage/useGetS3.hook';
-import { useObjectStorageData } from '../../ObjectStorage.context';
+import { useObjectStorageData } from '../../../../ObjectStorage.context';
 import { useUserForm } from './formUser/useUserForm.hook';
 import { cn } from '@/lib/utils';
 import { useAddS3Policy } from '@/data/hooks/s3-storage/useAddS3Policy.hook';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.spec.tsx
index e36c8f6748f0..ee067a2a4eaa 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/AddUserS3.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.spec.tsx
@@ -18,14 +18,17 @@ import {
 import AddUserS3Modal from './AddUserS3.modal';
 import { mockedObjStoError } from '@/__tests__/helpers/apiError';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/hooks/s3-storage/useGetS3.hook', () => ({
   useGetS3: vi.fn(() => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/formUser/useUserForm.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/formUser/useUserForm.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/add-user-s3/formUser/useUserForm.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/formUser/useUserForm.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.modal.tsx
similarity index 87%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.modal.tsx
index 07eab4b5685d..9dd55b413303 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.modal.tsx
@@ -1,6 +1,6 @@
 import { useNavigate, useParams } from 'react-router-dom';
 import { useGetS3 } from '@/data/hooks/s3-storage/useGetS3.hook';
-import DeleteS3 from '../_components/DeleteS3.component';
+import DeleteS3 from '../../../_components/storages/DeleteS3.component';
 
 const DeleteS3Modal = () => {
   const { projectId, storageId, region } = useParams<{
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.spec.tsx
index 00d5429408f8..f9d6714a5e7b 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteS3/DeleteS3.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[storageId]/[region]/DeleteS3.spec.tsx
@@ -19,14 +19,17 @@ import {
 import DeleteS3Modal from './DeleteS3.modal';
 import { TERMINATE_CONFIRMATION } from '@/configuration/polling.constants';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/hooks/s3-storage/useGetS3.hook', () => ({
   useGetS3: vi.fn(() => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.modal.tsx
similarity index 88%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.modal.tsx
index 17488028ebbf..9ea05d08e340 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.modal.tsx
@@ -1,6 +1,6 @@
 import { useNavigate, useParams } from 'react-router-dom';
 import { useGetSwift } from '@/data/hooks/swift-storage/useGetSwift.hook';
-import DeleteSwift from '../_components/DeleteSwift.component';
+import DeleteSwift from '../../_components/storages/DeleteSwift.component';
 
 const DeleteSwiftModal = () => {
   const { projectId, swiftId } = useParams<{
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.spec.tsx
index ae3738606cb0..3cde6bc1ec98 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/deleteSwift/DeleteSwift.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/delete/[swiftId]/DeleteSwift.spec.tsx
@@ -19,14 +19,17 @@ import DeleteSwiftModal from './DeleteSwift.modal';
 import { TERMINATE_CONFIRMATION } from '@/configuration/polling.constants';
 import { mockedSwiftContainer } from '@/__tests__/helpers/mocks/swift/swift';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/hooks/swift-storage/useGetSwift.hook', () => ({
   useGetSwift: vi.fn(() => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.spec.tsx
index f2e356063149..ef7f9060b755 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.spec.tsx
@@ -13,7 +13,7 @@ import {
   setMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import { mockManagerReactShellClient } from '@/__tests__/helpers/mockShellHelper';
-import Service, { breadcrumb as Breadcrumb } from './Create.page';
+import Service, { breadcrumb as Breadcrumb } from './CreateObjectStorage.page';
 import {
   mocked3AZRegion,
   mockedGRARegion,
@@ -45,7 +45,7 @@ vi.mock('@/data/hooks/project/usePciProject.hook', () => ({
   }),
 }));
 
-describe('Create.page', () => {
+describe('CreateObjectStorage.page', () => {
   beforeEach(() => {
     vi.restoreAllMocks();
     mockedUsedNavigate();
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.tsx
similarity index 87%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.tsx
index f1aa1b865f7d..b192adbf55c1 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/Create.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/CreateObjectStorage.page.tsx
@@ -9,16 +9,14 @@ import { useGetProductAvailability } from '@/data/hooks/availability/useGetProdu
 import OrderSkeleton from './_components/OrderSkeleton.component';
 import Guides from '@/components/guides/Guides.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey={`breadcrumb`}
-      namespace="pci-object-storage/order-funnel"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey={`breadcrumb`}
+    namespace="pci-object-storage/order-funnel"
+  />
+);
 
-const Service = () => {
+const CreateObjectStorage = () => {
   const { t } = useTranslation('pci-object-storage/order-funnel');
   const { projectId } = useParams();
   const availabilityQuery = useGetProductAvailability(projectId);
@@ -54,4 +52,5 @@ const Service = () => {
   );
 };
 
-export default Service;
+export { breadcrumb };
+export default CreateObjectStorage;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderFunnel.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderFunnel.component.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderFunnel.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderFunnel.component.tsx
index 0e39a92153d6..499e7170b6b8 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderFunnel.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderFunnel.component.tsx
@@ -35,7 +35,7 @@ import {
   STORAGE_ASYNC_REPLICATION_LINK,
   STORAGE_PRICES_LINK,
   useLink,
-} from './orderFunnel.const';
+} from './orderFunnel.constants';
 import usePciProject from '@/data/hooks/project/usePciProject.hook';
 import { PlanCode } from '@/configuration/project';
 import A from '@/components/links/A.component';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderPricing.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderPricing.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderPricing.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderPricing.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSkeleton.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSkeleton.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSkeleton.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSkeleton.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSummary.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSummary.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSummary.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSummary.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSummary.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSummary.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/OrderSummary.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/OrderSummary.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/Section.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/Section.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/Section.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/Section.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/orderFunnel.const.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/orderFunnel.constants.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/orderFunnel.const.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/orderFunnel.constants.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/orderFunnel.schema.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/orderFunnel.schema.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/orderFunnel.schema.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/orderFunnel.schema.tsx
index ffd10659c7b0..babb839f4f84 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/orderFunnel.schema.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/orderFunnel.schema.tsx
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import i18next from 'i18next';
-import { ObjectContainerOffers } from './orderFunnel.const';
+import { ObjectContainerOffers } from './orderFunnel.constants';
 import storages from '@/types/Storages';
 
 export const createOrderFunnelFormSchema = (t: typeof i18next.t) => {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/ContainerTypeStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/ContainerTypeStep.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/ContainerTypeStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/ContainerTypeStep.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/EncryptStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/EncryptStep.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/EncryptStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/EncryptStep.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/NameStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/NameStep.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/NameStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/NameStep.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/ObjectLockStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/ObjectLockStep.component.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/ObjectLockStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/ObjectLockStep.component.tsx
index a1ddd3bf48cf..f3ce476c5b4c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/ObjectLockStep.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/ObjectLockStep.component.tsx
@@ -14,7 +14,7 @@ import React, { useEffect } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import storages from '@/types/Storages';
 import A from '@/components/links/A.component';
-import { STORAGE_OBJECT_LOCK_LINKS, useLink } from '../orderFunnel.const';
+import { STORAGE_OBJECT_LOCK_LINKS, useLink } from '../orderFunnel.constants';
 
 interface ObjectLockStepProps {
   value?: storages.ObjectLockStatusEnum;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/OfferStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/OfferStep.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/OfferStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/OfferStep.component.tsx
index 9c886ef4649b..1da5ddf746f2 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/OfferStep.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/OfferStep.component.tsx
@@ -7,7 +7,7 @@ import {
 } from '@datatr-ux/uxlib';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ObjectContainerOffers } from '../orderFunnel.const';
+import { ObjectContainerOffers } from '../orderFunnel.constants';
 
 interface OfferStepProps {
   value?: ObjectContainerOffers;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/OffsiteReplicationStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/OffsiteReplicationStep.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/OffsiteReplicationStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/OffsiteReplicationStep.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/RegionDeploymentSelection.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/RegionDeploymentSelection.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/RegionDeploymentSelection.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/RegionDeploymentSelection.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/RegionStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/RegionStep.component.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/RegionStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/RegionStep.component.tsx
index 6e69024805f8..4189e038cbb0 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/RegionStep.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/RegionStep.component.tsx
@@ -20,7 +20,7 @@ import { useTranslatedMicroRegions } from '@/hooks/useTranslatedMicroRegions';
 import {
   DeploymentModeSelection,
   getDefaultDeploymentModes,
-} from './RegionDeploymentSelection';
+} from './RegionDeploymentSelection.component';
 import cloud from '@/types/Cloud';
 import OvhLink from '@/components/links/OvhLink.component';
 import usePciProject from '@/data/hooks/project/usePciProject.hook';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/UserStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/UserStep.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/UserStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/UserStep.component.tsx
index dcfe126f63c9..d0ce065d05a6 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/UserStep.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/UserStep.component.tsx
@@ -15,7 +15,7 @@ import {
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
-import UserSecretKey from '@/pages/object-storage/users/show-secret/_components/UserSecretKey.component';
+import UserSecretKey from '@/pages/object-storage/users/user-secret/[userId]/_components/UserSecretKey.component';
 import AddUserForm from '@/pages/object-storage/users/create/AddUserForm.component';
 
 import * as TUser from '@/types/User';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/VersionningStep.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/VersionningStep.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/steps/VersionningStep.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/steps/VersionningStep.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useAvailableRegions.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useAvailableRegions.hook.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useAvailableRegions.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useAvailableRegions.hook.tsx
index 40393ba6bbfb..2dc4c989c555 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useAvailableRegions.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useAvailableRegions.hook.tsx
@@ -11,14 +11,14 @@ interface UseAvailableRegionsProps {
     filterServiceName: string | null;
   };
 }
-export function useAvailableRegions({
+const useAvailableRegions = ({
   regions,
   availabilities,
   options = {
     filterDisabledRegions: true,
     filterServiceName: null,
   },
-}: UseAvailableRegionsProps) {
+}: UseAvailableRegionsProps) => {
   const availableRegions: Region[] = useMemo(() => {
     // 1. Gather all regions from plans that start with "storage"
     const allRegions: AvailabilityRegion[] = availabilities.plans
@@ -59,4 +59,6 @@ export function useAvailableRegions({
     );
   }, [options, availabilities.plans, regions]);
   return availableRegions;
-}
+};
+
+export { useAvailableRegions };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderFunnel.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderFunnel.hook.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderFunnel.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderFunnel.hook.tsx
index 31e27af93823..5443c8a7d860 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderFunnel.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderFunnel.hook.tsx
@@ -6,11 +6,11 @@ import { useTranslation } from 'react-i18next';
 import { generateName } from '@/lib/nameGenerator';
 import * as Tuser from '@/types/User';
 import { ProductAvailability } from '@/types/Availability';
-import { useAvailableRegions } from './useAvailableRegions.component';
+import { useAvailableRegions } from './useAvailableRegions.hook';
 import order from '@/types/Order';
 import storages from '@/types/Storages';
 import { useOrderPricing } from './useOrderPricing.hook';
-import { ObjectContainerOffers } from './orderFunnel.const';
+import { ObjectContainerOffers } from './orderFunnel.constants';
 import cloud from '@/types/Cloud';
 import {
   createOrderFunnelFormSchema,
@@ -33,12 +33,12 @@ export const isSwiftOrder = (
   o: cloud.StorageContainerCreation | cloud.ProjectStorageCreation,
 ): o is cloud.ProjectStorageCreation => 'containerName' in o;
 
-export function useOrderFunnel({
+const useOrderFunnel = ({
   regions,
   users,
   availabilities,
   catalog,
-}: UseOrderFunnelProps) {
+}: UseOrderFunnelProps) => {
   const { t } = useTranslation('pci-object-storage/order-funnel');
   const orderFunnelFormSchema = createOrderFunnelFormSchema(t);
 
@@ -229,4 +229,6 @@ export function useOrderFunnel({
     pricings,
     result,
   };
-}
+};
+
+export { useOrderFunnel };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderPricing.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderPricing.hook.tsx
similarity index 89%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderPricing.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderPricing.hook.tsx
index b19afe53fe9b..b0a01ff23166 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/create/_components/useOrderPricing.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/new/_components/useOrderPricing.hook.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { ObjectContainerOffers } from './orderFunnel.const';
+import { ObjectContainerOffers } from './orderFunnel.constants';
 import order from '@/types/Order';
 import cloud from '@/types/Cloud';
 
@@ -9,12 +9,12 @@ interface UseOrderPricingProps {
   catalog: order.catalog._public.Catalog;
   replicationEnabled: boolean;
 }
-export function useOrderPricing({
+const useOrderPricing = ({
   offer,
   region,
   catalog,
   replicationEnabled,
-}: UseOrderPricingProps) {
+}: UseOrderPricingProps) => {
   const pricings = useMemo(() => {
     const REGION_TYPE_PREFIX: Record<string, string> = {
       [cloud.RegionTypeEnum.localzone]: '-LZ',
@@ -45,4 +45,6 @@ export function useOrderPricing({
   }, [catalog, offer, region, replicationEnabled]);
 
   return pricings;
-}
+};
+
+export { useOrderPricing };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/onboarding/Onboarding.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/onboarding/Onboarding.page.tsx
index 3aeafb73a3ea..7777487bd431 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/onboarding/Onboarding.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/onboarding/Onboarding.page.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@datatr-ux/uxlib';
 import { useTranslation } from 'react-i18next';
 import onboardingImgSrc from '@/../public/assets/ObjectSto.png';
-import OnboardingTile from '../../../components/onboarding-tile/OnboardingTile.component';
+import OnboardingTile from '@/components/onboarding-tile/OnboardingTile.component';
 import RoadmapChangelog from '@/components/roadmap-changelog/RoadmapChangelog.component';
 import { GUIDES, getGuideUrl } from '@/configuration/guide';
 import { useLocale } from '@/hooks/useLocale';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.context.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.context.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.context.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.context.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.spec.tsx
index 01e143cfe712..87e8cabdea9c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.spec.tsx
@@ -23,7 +23,9 @@ const loaderParam = {
   request: new Request('https://my-api.com/endpoint'),
 };
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [mockedStorageContainer],
@@ -31,7 +33,8 @@ vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
     users: [mockedCloudUser],
     regions: [mockedRegion, mocked3AZRegion],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/s3Storage.api', () => ({
   getS3Storage: vi.fn(() => mockedStorageContainer),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.layout.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.tsx
index 397e7c697634..0b5d8c3b319d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/S3.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/S3.layout.tsx
@@ -30,15 +30,13 @@ export const Loader = async ({ params }: S3LayoutProps) => {
     );
 };
 
-function S3Name() {
+const S3Name = () => {
   const { s3Name } = useParams();
   if (!s3Name) return '';
   return s3Name;
-}
+};
 
-export function breadcrumb() {
-  return <S3Name />;
-}
+const breadcrumb = () => <S3Name />;
 
 const HIDE_HEADER_ROUTE_PATTERNS = ['s3.object.'];
 
@@ -50,7 +48,7 @@ const shouldHideS3Header = (
   );
 };
 
-export default function S3Layout() {
+const S3 = () => {
   const { isUserActive } = useUserActivityContext();
   const { projectId, region, s3Name } = useParams();
   const matches = useMatches();
@@ -92,4 +90,7 @@ export default function S3Layout() {
       </div>
     </>
   );
-}
+};
+
+export { breadcrumb };
+export default S3;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/_components/S3Header.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/_components/S3Header.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/_components/S3Header.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/_components/S3Header.component.tsx
index 938cd964539f..db9b13f7a902 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/_components/S3Header.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/_components/S3Header.component.tsx
@@ -57,8 +57,7 @@ export const S3Header = ({ s3 }: { s3: StorageContainer }) => {
   );
 };
 
-S3Header.Skeleton = function S3HeaderSkeleton() {
-  return (
+S3Header.Skeleton = () => (
     <div className="flex gap-2 items-center mt-4 mb-6">
       <Skeleton className="rounded-full h-14 w-14" />
       <div>
@@ -73,4 +72,4 @@ S3Header.Skeleton = function S3HeaderSkeleton() {
       </div>
     </div>
   );
-};
+
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/_components/S3Tabs.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/_components/S3Tabs.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/_components/S3Tabs.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/_components/S3Tabs.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.spec.tsx
similarity index 92%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.spec.tsx
index 746918605641..0950f8872bc9 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.spec.tsx
@@ -9,7 +9,7 @@ import {
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import { mockedUsedNavigate } from '@/__tests__/helpers/mockRouterDomHelper';
 import { mockManagerReactShellClient } from '@/__tests__/helpers/mockShellHelper';
-import Dashboard, { breadcrumb as Breadcrumb } from './Dashboard.page';
+import Dashboard, { breadcrumb as Breadcrumb } from './S3Dashboard.page';
 import { mockedStorageContainer } from '@/__tests__/helpers/mocks/storageContainer/storageContainer';
 import { mockedCloudUser } from '@/__tests__/helpers/mocks/cloudUser/user';
 import {
@@ -18,7 +18,9 @@ import {
   mockedRegion,
 } from '@/__tests__/helpers/mocks/region/region';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [mockedStorageContainer],
@@ -26,21 +28,25 @@ vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
     users: [mockedCloudUser],
     regions: [mockedRegion, mocked3AZRegion, mockedLZRegion],
   })),
-}));
+  }),
+);
 
-vi.mock('@/pages/object-storage/storage/s3Id/S3.context', () => ({
+vi.mock(
+  '@/pages/object-storage/s3/[region]/[s3Name]/S3.context',
+  () => ({
   useS3Data: vi.fn(() => ({
     projectId: 'projectId',
     s3: mockedStorageContainer,
     s3Query: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/s3Storage.api', () => ({
   getS3Storage: vi.fn(),
 }));
 
-describe('Dashboard.page', () => {
+describe('S3Dashboard.page', () => {
   beforeEach(() => {
     vi.restoreAllMocks();
     mockedUsedNavigate();
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.tsx
index f4533ffda08f..8ada71d6df9c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/Dashboard.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page.tsx
@@ -2,7 +2,7 @@ import { Badge, Card, CardContent, CardHeader } from '@datatr-ux/uxlib';
 import { Archive, FileKey, FileStack, FolderLock, Tag } from 'lucide-react';
 import { Outlet } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import BucketOverview from './_components/BucketOverview.components';
+import BucketOverview from './_components/BucketOverview.component';
 import Tags from './_components/Tags.component';
 import Guides from '@/components/guides/Guides.component';
 import Encryption from './_components/Encryption.component';
@@ -13,16 +13,14 @@ import { useIsLocaleZone } from '@/hooks/useIsLocalZone.hook';
 import { useObjectStorageData } from '@/pages/object-storage/ObjectStorage.context';
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="dashboardTab"
-      namespace="pci-object-storage/storages/header-tabs"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="dashboardTab"
+    namespace="pci-object-storage/storages/header-tabs"
+  />
+);
 
-const Dashboard = () => {
+const S3Dashboard = () => {
   const { s3 } = useS3Data();
   const { regions } = useObjectStorageData();
   const isLocaleZone = useIsLocaleZone(s3, regions);
@@ -131,4 +129,5 @@ const Dashboard = () => {
   );
 };
 
-export default Dashboard;
+export { breadcrumb };
+export default S3Dashboard;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/BucketOverview.components.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/BucketOverview.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/BucketOverview.components.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/BucketOverview.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Encryption.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Encryption.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Encryption.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Encryption.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/ObjectLock.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/ObjectLock.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/ObjectLock.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/ObjectLock.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/ObjectLock.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/ObjectLock.spec.tsx
similarity index 90%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/ObjectLock.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/ObjectLock.spec.tsx
index 75307e56bd63..43af41f0693d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/ObjectLock.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/ObjectLock.spec.tsx
@@ -11,7 +11,9 @@ import {
 import storages from '@/types/Storages';
 import ObjectLock from './ObjectLock.component';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [mockedStorageContainer],
@@ -19,9 +21,12 @@ vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
     users: [mockedCloudUser],
     regions: [mockedRegion, mocked3AZRegion, mockedLZRegion],
   })),
-}));
+  }),
+);
 
-vi.mock('@/pages/object-storage/storage/s3Id/S3.context', () => ({
+vi.mock(
+  '@/pages/object-storage/s3/[region]/[s3Name]/S3.context',
+  () => ({
   useS3Data: vi.fn(() => ({
     projectId: 'projectId',
     s3: {
@@ -33,7 +38,8 @@ vi.mock('@/pages/object-storage/storage/s3Id/S3.context', () => ({
     },
     s3Query: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/s3Storage.api', () => ({
   getS3Storage: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Tags.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Tags.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Tags.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Tags.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Versionning.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Versionning.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/Versionning.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/Versionning.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-encryption/ActivateEncryption.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-encryption/ActivateEncryption.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-encryption/ActivateEncryption.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-encryption/ActivateEncryption.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-encryption/ActivateEncryption.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-encryption/ActivateEncryption.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-encryption/ActivateEncryption.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-encryption/ActivateEncryption.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-versionning/ActivateVersionning.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-versionning/ActivateVersionning.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-versionning/ActivateVersionning.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-versionning/ActivateVersionning.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-versionning/ActivateVersionning.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-versionning/ActivateVersionning.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/activate-versionning/ActivateVersionning.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-versionning/ActivateVersionning.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.sheet.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.modal.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.sheet.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.modal.tsx
index dc7578b81907..f42640fc14be 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.sheet.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.modal.tsx
@@ -36,7 +36,7 @@ import A from '@/components/links/A.component';
 import {
   STORAGE_OBJECT_LOCK_LINKS,
   useLink,
-} from '@/pages/object-storage/create/_components/orderFunnel.const';
+} from '@/pages/object-storage/new/_components/orderFunnel.constants';
 
 export interface Label {
   key?: string;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.schema.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.schema.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.schema.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.schema.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx
index 48b58109e3e0..e230a0b1a687 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.spec.tsx
@@ -15,7 +15,7 @@ import {
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import storages from '@/types/Storages';
 import { mockManagerReactShellClient } from '@/__tests__/helpers/mockShellHelper';
-import ObjectLockOptions from './ObjectLockOptions.sheet';
+import ObjectLockOptions from './ObjectLockOptions.modal';
 import cloud from '@/types/Cloud';
 import * as s3Api from '@/data/api/storage/s3Storage.api';
 import { mockedObjStoError } from '@/__tests__/helpers/apiError';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/delete/Delete.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/delete/DeleteS3Storage.modal.tsx
similarity index 83%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/delete/Delete.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/delete/DeleteS3Storage.modal.tsx
index 70f72857ec34..0e606728f8e7 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/dashboard/delete/Delete.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/dashboard/delete/DeleteS3Storage.modal.tsx
@@ -1,5 +1,5 @@
 import { useNavigate, useParams } from 'react-router-dom';
-import DeleteS3 from '../../../_components/DeleteS3.component';
+import DeleteS3 from '../../../../../_components/storages/DeleteS3.component';
 import { useS3Data } from '../../S3.context';
 
 const DeleteS3Modal = () => {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/ListS3Objects.page.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/ListS3Objects.page.tsx
index 48625625b4bf..90c1e79057bd 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/ListS3Objects.page.tsx
@@ -35,7 +35,7 @@ interface SelectAllCheckboxProps {
   items: S3BrowserItem[];
 }
 
-function SelectAllCheckbox({ items }: SelectAllCheckboxProps) {
+const SelectAllCheckbox = ({ items }: SelectAllCheckboxProps) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const {
     selectAll,
@@ -96,9 +96,9 @@ function SelectAllCheckbox({ items }: SelectAllCheckboxProps) {
       aria-label={t('selectAll')}
     />
   );
-}
+};
 
-const Objects = () => {
+const ListS3Objects = () => {
   const { projectId } = useParams();
   const { s3 } = useS3Data();
   const [navigationPrefix, setNavigationPrefix] = useState('');
@@ -254,4 +254,4 @@ const Objects = () => {
   );
 };
 
-export default Objects;
+export default ListS3Objects;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/S3Objects.layout.tsx
similarity index 60%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.layout.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/S3Objects.layout.tsx
index 6ca9bf023ad4..06c368823769 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/Objects.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/S3Objects.layout.tsx
@@ -2,11 +2,14 @@ import { Outlet } from 'react-router-dom';
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 import { useS3Data } from '../S3.context';
 
-export function breadcrumb() {
-  return <BreadcrumbItem translationKey="Objects" namespace="" />;
-}
+const breadcrumb = () => (
+  <BreadcrumbItem translationKey="Objects" namespace="" />
+);
 
-export default function Layout() {
+const S3Objects = () => {
   const parentOutletData = useS3Data();
   return <Outlet context={parentOutletData} />;
-}
+};
+
+export { breadcrumb };
+export default S3Objects;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/BulkActionButton.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/BulkActionButton.component.tsx
similarity index 89%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/BulkActionButton.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/BulkActionButton.component.tsx
index 834ca32308b3..928393af682c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/BulkActionButton.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/BulkActionButton.component.tsx
@@ -8,7 +8,7 @@ interface BulkActionButtonProps {
   className?: string;
 }
 
-export function BulkActionButton({ className }: BulkActionButtonProps) {
+const BulkActionButton = ({ className }: BulkActionButtonProps) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const navigate = useNavigate();
   const location = useLocation();
@@ -31,4 +31,6 @@ export function BulkActionButton({ className }: BulkActionButtonProps) {
       {t('bulkDeleteButtonConfirm', { count: selectedCount })}
     </Button>
   );
-}
+};
+
+export { BulkActionButton };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/DeepArchiveBadge.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/DeepArchiveBadge.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/DeepArchiveBadge.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/DeepArchiveBadge.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/DownloadIcon.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/DownloadIcon.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/DownloadIcon.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/DownloadIcon.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FileRow.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FileRow.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FileRow.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FileRow.component.tsx
index a61283a45105..7bfa16b17678 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FileRow.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FileRow.component.tsx
@@ -22,7 +22,7 @@ interface FileRowProps {
   showVersion?: boolean;
 }
 
-export function FileRow({ item, showVersion }: FileRowProps) {
+const FileRow = ({ item, showVersion }: FileRowProps) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const { t: tObj } = useTranslation(
     'pci-object-storage/storages/s3/object-class',
@@ -103,4 +103,6 @@ export function FileRow({ item, showVersion }: FileRowProps) {
       <RowActions actions={actions} />
     </div>
   );
-}
+};
+
+export { FileRow };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FolderRow.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FolderRow.component.tsx
similarity index 93%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FolderRow.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FolderRow.component.tsx
index 18686679d13b..cabaceb79110 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/FolderRow.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/FolderRow.component.tsx
@@ -11,7 +11,7 @@ interface FolderRowProps {
   onOpenFolder: (prefix: string) => void;
 }
 
-export function FolderRow({ item, onOpenFolder }: FolderRowProps) {
+const FolderRow = ({ item, onOpenFolder }: FolderRowProps) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const handleOpen = () => onOpenFolder(item.key);
 
@@ -38,4 +38,6 @@ export function FolderRow({ item, onOpenFolder }: FolderRowProps) {
       </div>
     </div>
   );
-}
+};
+
+export { FolderRow };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/LZFileRow.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/LZFileRow.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/LZFileRow.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/LZFileRow.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/ParentRow.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/ParentRow.component.tsx
similarity index 92%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/ParentRow.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/ParentRow.component.tsx
index 9e9334922dea..677c193e30de 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/ParentRow.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/ParentRow.component.tsx
@@ -12,7 +12,7 @@ interface ParentRowProps {
   onOpenFolder: (prefix: string) => void;
 }
 
-export function ParentRow({ prefix, onOpenFolder }: ParentRowProps) {
+const ParentRow = ({ prefix, onOpenFolder }: ParentRowProps) => {
   const handleOpen = () => onOpenFolder(getParentPrefix(prefix));
 
   const handleKeyDown = (e: React.KeyboardEvent) => {
@@ -37,4 +37,6 @@ export function ParentRow({ prefix, onOpenFolder }: ParentRowProps) {
       </div>
     </div>
   );
-}
+};
+
+export { ParentRow };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/RowActions.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/RowActions.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/RowActions.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/RowActions.component.tsx
index 69a308a45d1b..3c6468ca949d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/RowActions.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/RowActions.component.tsx
@@ -28,8 +28,7 @@ interface RowActionsProps {
   testId?: string;
 }
 
-export function RowActions({ actions, testId }: RowActionsProps) {
-  return (
+const RowActions = ({ actions, testId }: RowActionsProps) => (
     <>
       {/* Desktop actions */}
       <div className="text-right hidden md:flex">
@@ -86,4 +85,5 @@ export function RowActions({ actions, testId }: RowActionsProps) {
       </div>
     </>
   );
-}
+
+export { RowActions };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectDropFile.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectDropFile.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectDropFile.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectDropFile.component.tsx
index a89158740d15..5d1b364cbdd5 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectDropFile.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectDropFile.component.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import storages from '@/types/Storages';
 import AddS3Form from '../add/AddS3Form.component';
 import FileUploadPending from '@/components/file-input/FileUploadPending.component';
-import { useAddS3Form } from '../add/useAddForm.component';
+import { useAddS3Form } from '../add/useAddForm.hook';
 
 export interface DroppedFiles {
   files: File[];
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectListTopbar.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectListTopbar.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectListTopbar.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectListTopbar.component.tsx
index eef9606cfcce..c5b11a6571b5 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectListTopbar.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectListTopbar.component.tsx
@@ -6,7 +6,7 @@ import { useObjectSelection } from '../_contexts/ObjectSelection.context';
 
 type BrowserObject = StorageObject & { name: string };
 
-export function S3ObjectListTopbar() {
+const S3ObjectListTopbar = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const { prefix, index } = useBrowser<BrowserObject>();
   const {
@@ -72,4 +72,6 @@ export function S3ObjectListTopbar() {
       </div>
     </div>
   );
-}
+};
+
+export { S3ObjectListTopbar };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectRow.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectRow.component.tsx
similarity index 92%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectRow.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectRow.component.tsx
index 305b17d40a74..f504767cedce 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/S3ObjectRow.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/S3ObjectRow.component.tsx
@@ -12,13 +12,13 @@ interface S3ObjectRowProps {
   isLocaleZone?: boolean;
 }
 
-export function S3ObjectRow({
+const S3ObjectRow = ({
   item,
   prefix,
   onOpenFolder,
   showVersion,
   isLocaleZone,
-}: S3ObjectRowProps) {
+}: S3ObjectRowProps) => {
   switch (item.type) {
     case 'parent':
       return <ParentRow prefix={prefix} onOpenFolder={onOpenFolder} />;
@@ -36,4 +36,6 @@ export function S3ObjectRow({
     default:
       return null;
   }
-}
+};
+
+export { S3ObjectRow };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/StorageClassWarningMessage.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/StorageClassWarningMessage.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_components/StorageClassWarningMessage.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_components/StorageClassWarningMessage.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_contexts/ObjectSelection.context.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_contexts/ObjectSelection.context.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_contexts/ObjectSelection.context.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_contexts/ObjectSelection.context.tsx
index d6c75c441e5b..71339345cc60 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_contexts/ObjectSelection.context.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_contexts/ObjectSelection.context.tsx
@@ -32,22 +32,22 @@ const ObjectSelectionContext = createContext<ObjectSelectionContextValue | null>
 const getSelectionKey = (key: string, versionId?: string | null) =>
   `${key}-${versionId}`;
 
-export function useObjectSelection() {
+const useObjectSelection = () => {
   const ctx = useContext(ObjectSelectionContext);
   if (!ctx)
     throw new Error(
       'useObjectSelection must be used within ObjectSelectionProvider',
     );
   return ctx;
-}
+};
 
 interface ObjectSelectionProviderProps {
   children: React.ReactNode;
 }
 
-export function ObjectSelectionProvider({
+const ObjectSelectionProvider = ({
   children,
-}: ObjectSelectionProviderProps) {
+}: ObjectSelectionProviderProps) => {
   const [selectedObjects, setSelectedObjects] = useState<
     Map<string, SelectedObject>
   >(new Map());
@@ -114,4 +114,6 @@ export function ObjectSelectionProvider({
       {children}
     </ObjectSelectionContext.Provider>
   );
-}
+};
+
+export { ObjectSelectionProvider, useObjectSelection };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_hooks/useS3ObjectActions.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_hooks/useS3ObjectActions.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/_hooks/useS3ObjectActions.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/_hooks/useS3ObjectActions.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/AddS3Form.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Form.component.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/AddS3Form.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Form.component.tsx
index 00ef587c8054..c1eb4a664f80 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/AddS3Form.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Form.component.tsx
@@ -19,7 +19,7 @@ import StorageClassSelector from '@/components/storage-class-selector/StorageCla
 import { useAvailableStorageClasses } from '@/hooks/useAvailableStorageClasses.hook';
 import storages from '@/types/Storages';
 import { useS3Data } from '../../S3.context';
-import { StorageClassWarningMessage } from '../_components/StorageClassWarningMessage';
+import { StorageClassWarningMessage } from '../_components/StorageClassWarningMessage.component';
 
 interface AddS3FormProps {
   onSubmit: SubmitHandler<{
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/Add.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Object.modal.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/Add.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Object.modal.tsx
index a259d4b66513..c30538955a07 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/Add.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Object.modal.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import FileUploadPending from '@/components/file-input/FileUploadPending.component';
 import RouteModal from '@/components/route-modal/RouteModal';
 import AddS3Form from './AddS3Form.component';
-import { useAddS3Form } from './useAddForm.component';
+import { useAddS3Form } from './useAddForm.hook';
 import storages from '@/types/Storages';
 
 const AddObjectModal = () => {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/useAddForm.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/useAddForm.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/add/useAddForm.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/add/useAddForm.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/bulk-delete/BulkDeleteObjects.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/bulk-delete/BulkDeleteS3Objects.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/bulk-delete/BulkDeleteObjects.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/bulk-delete/BulkDeleteS3Objects.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/delete/DeleteObject.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/delete/DeleteS3Object.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/delete/DeleteObject.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/delete/DeleteS3Object.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/generate-demo.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/generate-demo.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/generate-demo.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/generate-demo.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.layout.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.layout.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.layout.tsx
index f479c628ee38..eb286df27478 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.layout.tsx
@@ -14,17 +14,15 @@ import { useGetS3ObjectVersions } from '@/data/hooks/s3-storage/useGetS3ObjectVe
 import { ObjectHeader } from './_components/ObjectHeader.component';
 import { ObjStoError } from '@/data/api';
 
-function ObjectKey() {
+const ObjectKey = () => {
   const [searchParams] = useSearchParams();
   const objectKey = searchParams.get('objectKey');
   return objectKey;
-}
+};
 
-export function breadcrumb() {
-  return <ObjectKey />;
-}
+const breadcrumb = () => <ObjectKey />;
 
-export default function ObjectLayout() {
+const S3Object = () => {
   const navigate = useNavigate();
   const { projectId } = useParams();
   const [searchParams] = useSearchParams();
@@ -82,4 +80,7 @@ export default function ObjectLayout() {
       </div>
     </>
   );
-}
+};
+
+export { breadcrumb };
+export default S3Object;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.page.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.page.tsx
index 7b0ada8279fe..9d69e78b442c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/Object.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.page.tsx
@@ -21,7 +21,7 @@ import FileIcon from '@/components/file-icon/FileIcon.component';
 import FormattedDate from '@/components/formatted-date/FormattedDate.component';
 import { useLocaleBytesConverter } from '@/hooks/useLocaleByteConverter.hook';
 
-const Object = () => {
+const S3Object = () => {
   const localeBytesConverter = useLocaleBytesConverter();
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const { t: tObj } = useTranslation(
@@ -142,4 +142,4 @@ const Object = () => {
   );
 };
 
-export default Object;
+export default S3Object;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectDownloadButton.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectDownloadButton.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectDownloadButton.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectDownloadButton.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectHeader.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectHeader.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectHeader.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectHeader.component.tsx
index 87c5c7214fe9..500b0e66b8fa 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectHeader.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectHeader.component.tsx
@@ -40,8 +40,7 @@ export const ObjectHeader = ({ objectKey, object }: ObjectHeaderProps) => {
   );
 };
 
-ObjectHeader.Skeleton = function ObjectHeaderSkeleton() {
-  return (
+ObjectHeader.Skeleton = () => (
     <div className="flex gap-2 items-center mt-4 mb-6">
       <Skeleton className="rounded-full h-14 w-14" />
       <div>
@@ -55,4 +54,4 @@ ObjectHeader.Skeleton = function ObjectHeaderSkeleton() {
       </div>
     </div>
   );
-};
+
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectTabs.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectTabs.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/_components/ObjectTabs.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/_components/ObjectTabs.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/change-storage-class/ChangeStorageClass.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/change-storage-class/ChangeS3ObjectStorageClass.modal.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/change-storage-class/ChangeStorageClass.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/change-storage-class/ChangeS3ObjectStorageClass.modal.tsx
index 0a6134d27726..d27984e4983c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/change-storage-class/ChangeStorageClass.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/change-storage-class/ChangeS3ObjectStorageClass.modal.tsx
@@ -20,7 +20,7 @@ import { useLocale } from '@/hooks/useLocale';
 import { getObjectStoreApiErrorMessage } from '@/lib/apiHelper';
 import storages from '@/types/Storages';
 import { useS3Data } from '../../../S3.context';
-import { StorageClassWarningMessage } from '../../_components/StorageClassWarningMessage';
+import { StorageClassWarningMessage } from '../../_components/StorageClassWarningMessage.component';
 
 const ChangeStorageClassModal = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/RestoreS3Form.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreS3Form.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/RestoreS3Form.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreS3Form.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/Restore.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreS3Object.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/Restore.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreS3Object.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/RestoreService.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreService.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/RestoreService.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreService.component.tsx
index 3f480833e7d7..61b334d724ce 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/RestoreService.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreService.component.tsx
@@ -12,7 +12,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import RouteModal from '@/components/route-modal/RouteModal';
 import RestoreS3Form from './RestoreS3Form.component';
-import { useRestoreS3Form } from './useRestoreForm.component';
+import { useRestoreS3Form } from './useRestoreForm.hook';
 import FormattedDate from '@/components/formatted-date/FormattedDate.component';
 
 interface RestoreServiceModalProps {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/useRestoreForm.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/useRestoreForm.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/restore/useRestoreForm.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/useRestoreForm.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/Versions.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/S3ObjectVersions.page.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/Versions.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/S3ObjectVersions.page.tsx
index 181cbd9f8e47..de726574ffa5 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/Versions.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/S3ObjectVersions.page.tsx
@@ -7,7 +7,7 @@ import S3ObjectVersionList from './_components/S3VersionObjectListTable.componen
 import { useGetS3ObjectVersions } from '@/data/hooks/s3-storage/useGetS3ObjectVersions.hook';
 import { ObjectSelectionProvider } from '../../_contexts/ObjectSelection.context';
 
-const Versions = () => {
+const S3ObjectVersions = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const { projectId } = useParams();
   const { s3 } = useS3Data();
@@ -52,4 +52,4 @@ const Versions = () => {
   );
 };
 
-export default Versions;
+export default S3ObjectVersions;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx
index 53f092295238..9aaf8c9f6552 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3ObjectVersionListColumns.component.tsx
@@ -29,7 +29,7 @@ interface ObjectVersionListColumnsProps {
   isPending: boolean;
 }
 
-function SelectCheckboxCell({ object }: { object: StorageObject }) {
+const SelectCheckboxCell = ({ object }: { object: StorageObject }) => {
   const { isSelected, setSelection } = useObjectSelection();
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
 
@@ -46,9 +46,9 @@ function SelectCheckboxCell({ object }: { object: StorageObject }) {
       aria-label={t('selectObject', { name: object.key })}
     />
   );
-}
+};
 
-function SelectAllHeader({ objects }: { objects: StorageObject[] }) {
+const SelectAllHeader = ({ objects }: { objects: StorageObject[] }) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/objects');
   const {
     selectAll,
@@ -97,7 +97,7 @@ function SelectAllHeader({ objects }: { objects: StorageObject[] }) {
       aria-label={t('selectAll')}
     />
   );
-}
+};
 
 export const getColumns = ({
   isPending,
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3VersionObjectFilters.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3VersionObjectFilters.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3VersionObjectFilters.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3VersionObjectFilters.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3VersionObjectListTable.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3VersionObjectListTable.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3VersionObjectListTable.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3VersionObjectListTable.component.tsx
index dbaf670ddef9..28534752d81b 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/_components/S3VersionObjectListTable.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/_components/S3VersionObjectListTable.component.tsx
@@ -21,11 +21,11 @@ interface ObjectsListProps {
   isLoading: boolean;
 }
 
-export default function S3ObjectVersionList({
+const S3ObjectVersionList = ({
   objects,
   onRefreshClicked,
   isLoading,
-}: ObjectsListProps) {
+}: ObjectsListProps) => {
   const { projectId } = useParams();
   const { s3 } = useS3Data();
   const [objectName, setObjectName] = useState<string>('');
@@ -98,4 +98,6 @@ export default function S3ObjectVersionList({
       <DataTable.Pagination />
     </DataTable.Provider>
   );
-}
+};
+
+export default S3ObjectVersionList;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/delete/DeleteObjectVersion.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/delete/DeleteS3ObjectVersion.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/object/versions/delete/DeleteObjectVersion.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/delete/DeleteS3ObjectVersion.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/objects.constants.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/objects.constants.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/objects.constants.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/objects.constants.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/objects.utils.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/objects.utils.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/objects.utils.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/objects.utils.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/restore/Restore.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/restore/RestoreS3ObjectFromList.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/objects/restore/Restore.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/objects/restore/RestoreS3ObjectFromList.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/list/List.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/ListReplicationRules.page.tsx
similarity index 84%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/list/List.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/ListReplicationRules.page.tsx
index 4c8098b99742..f221f6ed21da 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/list/List.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/ListReplicationRules.page.tsx
@@ -1,11 +1,11 @@
 import { useMemo } from 'react';
 import { Outlet } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { useS3Data } from '../../S3.context';
-import ReplicationList from '../_components/table/ReplicationList.component';
+import { useS3Data } from '../S3.context';
+import ReplicationList from './_components/table/ReplicationList.component';
 import Guides from '@/components/guides/Guides.component';
 
-const ReplicationListPage = () => {
+const ListReplicationRules = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/replication');
   const { s3, s3Query } = useS3Data();
 
@@ -39,4 +39,4 @@ const ReplicationListPage = () => {
   );
 };
 
-export default ReplicationListPage;
+export default ListReplicationRules;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.page.tsx
new file mode 100644
index 000000000000..1dc2d6da31d0
--- /dev/null
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.page.tsx
@@ -0,0 +1,14 @@
+import { Outlet } from 'react-router-dom';
+import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
+
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="replicationTab"
+    namespace="pci-object-storage/storages/header-tabs"
+  />
+);
+
+const Replication = () => <Outlet />;
+
+export { breadcrumb };
+export default Replication;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.spec.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.spec.tsx
index 08d1eabc68cb..c875bf32af39 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.spec.tsx
@@ -8,7 +8,7 @@ import {
 } from '@testing-library/react';
 import { UseQueryResult } from '@tanstack/react-query';
 import { mockManagerReactShellClient } from '@/__tests__/helpers/mockShellHelper';
-import { useS3Data } from '@/pages/object-storage/storage/s3Id/S3.context';
+import { useS3Data } from '@/pages/object-storage/s3/[region]/[s3Name]/S3.context';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import {
   mockedS3WithReplication,
@@ -20,7 +20,7 @@ import { mockedRegion } from '@/__tests__/helpers/mocks/region/region';
 import * as storageAPI from '@/data/api/storage/storages.api';
 import { mockedUsedNavigate } from '@/__tests__/helpers/mockRouterDomHelper';
 import { breadcrumb as Breadcrumb } from './Replication.page';
-import Replication from './list/List.page';
+import Replication from './ListReplicationRules.page';
 import cloud from '@/types/Cloud';
 import { mockedReplicationRule } from '@/__tests__/helpers/mocks/storageContainer/replication';
 import { openButtonInMenu } from '@/__tests__/helpers/unitTestHelper';
@@ -64,9 +64,12 @@ const loadingQueryMock: UseQueryResult<cloud.StorageContainer, Error> = {
   status: 'pending',
 };
 
-vi.mock('@/pages/object-storage/storage/s3Id/S3.context', () => ({
-  useS3Data: vi.fn(),
-}));
+vi.mock(
+  '@/pages/object-storage/s3/[region]/[s3Name]/S3.context',
+  () => ({
+    useS3Data: vi.fn(),
+  }),
+);
 
 vi.mock('@/data/api/storage/storages.api', () => ({
   getStorages: vi.fn(() => mockedStorages),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationForm.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationForm.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationForm.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationForm.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationForm.context.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationForm.context.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationForm.context.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationForm.context.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleAdvanced.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleAdvanced.component.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleAdvanced.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleAdvanced.component.tsx
index b21f36f6df8c..efae7deecde1 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleAdvanced.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleAdvanced.component.tsx
@@ -12,7 +12,7 @@ import {
   Switch,
 } from '@datatr-ux/uxlib';
 import { Info } from 'lucide-react';
-import { ReplicationRuleContainer } from './ReplicatationRuleContainer';
+import { ReplicationRuleContainer } from './ReplicationRuleContainer.component';
 import storages from '@/types/Storages';
 import { FormField } from '@/components/form-field/FormField.component';
 import { useReplicationFormContext } from './ReplicationForm.context';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicatationRuleContainer.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleContainer.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicatationRuleContainer.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleContainer.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleDestination.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleDestination.component.tsx
similarity index 95%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleDestination.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleDestination.component.tsx
index 4303e41397fe..1729d406bc5a 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleDestination.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleDestination.component.tsx
@@ -16,11 +16,11 @@ import {
   Skeleton,
 } from '@datatr-ux/uxlib';
 import { AlertTriangle } from 'lucide-react';
-import { ReplicationRuleContainer } from './ReplicatationRuleContainer';
+import { ReplicationRuleContainer } from './ReplicationRuleContainer.component';
 import { FormField } from '@/components/form-field/FormField.component';
 import Flag from '@/components/flag/Flag.component';
 import { useReplicationFormContext } from './ReplicationForm.context';
-import { useGetAvailableDestinationsContainers } from './useGetDestinationContainers';
+import { useGetAvailableDestinationsContainers } from './useGetAvailableDestinationsContainers.hook';
 
 export const ReplicationRuleDestination = () => {
   const {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleIdentification.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleIdentification.component.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleIdentification.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleIdentification.component.tsx
index 7983a6436d37..9ecf39d60ddf 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleIdentification.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleIdentification.component.tsx
@@ -9,7 +9,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@datatr-ux/uxlib';
-import { ReplicationRuleContainer } from './ReplicatationRuleContainer';
+import { ReplicationRuleContainer } from './ReplicationRuleContainer.component';
 import { FormField } from '@/components/form-field/FormField.component';
 import { useReplicationFormContext } from './ReplicationForm.context';
 
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleScope.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleScope.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleScope.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleScope.component.tsx
index c685480338f3..f50c7e86f411 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/ReplicationRuleScope.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/ReplicationRuleScope.component.tsx
@@ -12,7 +12,7 @@ import {
 import { Info } from 'lucide-react';
 import { FormField } from '@/components/form-field/FormField.component';
 import { TagInput } from './TagInput.component';
-import { ReplicationRuleContainer } from './ReplicatationRuleContainer';
+import { ReplicationRuleContainer } from './ReplicationRuleContainer.component';
 import { useReplicationFormContext } from './ReplicationForm.context';
 
 export const ReplicationRuleScope = () => {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/TagInput.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/TagInput.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/TagInput.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/TagInput.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/buildReplicationRule.spec.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/buildReplicationRule.spec.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/buildReplicationRule.spec.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/buildReplicationRule.spec.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/buildReplicationRule.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/buildReplicationRule.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/buildReplicationRule.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/buildReplicationRule.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/useGetDestinationContainers.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/useGetAvailableDestinationsContainers.hook.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/useGetDestinationContainers.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/useGetAvailableDestinationsContainers.hook.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/useReplicationForm.hook.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/useReplicationForm.hook.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/form/useReplicationForm.hook.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/form/useReplicationForm.hook.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ActionsMenu.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ActionsMenu.component.tsx
similarity index 94%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ActionsMenu.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ActionsMenu.component.tsx
index 138a746175ea..e3ddaa73c5c2 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ActionsMenu.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ActionsMenu.component.tsx
@@ -16,11 +16,11 @@ type ActionsMenuProps = {
   onDelete: (replication: storages.ReplicationRule) => void;
 };
 
-export function ActionsMenu({
+const ActionsMenu = ({
   replication,
   onEdit,
   onDelete,
-}: Readonly<ActionsMenuProps>) {
+}: Readonly<ActionsMenuProps>) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/replication');
 
   return (
@@ -53,4 +53,6 @@ export function ActionsMenu({
       </DropdownMenuContent>
     </DropdownMenu>
   );
-}
+};
+
+export { ActionsMenu };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ReplicationList.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ReplicationList.component.tsx
similarity index 95%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ReplicationList.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ReplicationList.component.tsx
index 28f6ab9fb11b..732b1862c284 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ReplicationList.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ReplicationList.component.tsx
@@ -7,7 +7,7 @@ import { getColumns } from './ReplicationListColumns.component';
 import DataTable from '@/components/data-table';
 import { useS3Data } from '../../../S3.context';
 import storages from '@/types/Storages';
-import { useGetAvailableDestinationsContainers } from '../form/useGetDestinationContainers';
+import { useGetAvailableDestinationsContainers } from '../form/useGetAvailableDestinationsContainers.hook';
 import { hasDeletedDestination } from './replicationRules.utils';
 import { useFeatureAvailability } from '@ovh-ux/manager-module-common-api';
 
@@ -15,9 +15,9 @@ interface ReplicationListProps {
   replicationRules: storages.ReplicationRule[];
 }
 
-export default function ReplicationList({
+const ReplicationList = ({
   replicationRules,
-}: Readonly<ReplicationListProps>) {
+}: Readonly<ReplicationListProps>) => {
   const { t } = useTranslation('pci-object-storage/storages/s3/replication');
   const navigate = useNavigate();
   const { s3 } = useS3Data();
@@ -112,10 +112,9 @@ export default function ReplicationList({
       <DataTable.Pagination />
     </DataTable.Provider>
   );
-}
+};
 
-ReplicationList.Skeleton = function ReplicationListSkeleton() {
-  return (
+ReplicationList.Skeleton = () => (
     <>
       <div
         data-testid="replication-list-table-skeleton"
@@ -129,4 +128,5 @@ ReplicationList.Skeleton = function ReplicationListSkeleton() {
       <DataTable.Skeleton columns={6} rows={10} width={100} height={16} />
     </>
   );
-};
+
+export default ReplicationList;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ReplicationListColumns.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ReplicationListColumns.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/ReplicationListColumns.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/ReplicationListColumns.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/replicationRules.utils.ts b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/replicationRules.utils.ts
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/_components/table/replicationRules.utils.ts
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/_components/table/replicationRules.utils.ts
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.spec.tsx
similarity index 95%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.spec.tsx
index 4d87aa9279e1..7f37a74f4f3d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.spec.tsx
@@ -14,7 +14,7 @@ import {
   setMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import * as replicationApi from '@/data/api/replication/replication.api';
-import DeleteReplication from './Delete.modal';
+import DeleteReplication from './DeleteReplicationRule.modal';
 import { mockedS3WithReplication } from '@/__tests__/helpers/mocks/storageContainer/storageContainer';
 
 vi.mock('react-i18next', async (importOriginal) => {
@@ -27,13 +27,16 @@ vi.mock('react-i18next', async (importOriginal) => {
   };
 });
 
-vi.mock('@/pages/object-storage/storage/s3Id/S3.context', () => ({
+vi.mock(
+  '@/pages/object-storage/s3/[region]/[s3Name]/S3.context',
+  () => ({
   useS3Data: vi.fn(() => ({
     projectId: 'projectId',
     s3: mockedS3WithReplication,
     s3Query: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/replication/replication.api', () => ({
   updateReplications: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.tsx
index 71101670ec15..ad0d92b0ef46 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/delete/Delete.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal.tsx
@@ -11,7 +11,7 @@ import {
   useToast,
 } from '@datatr-ux/uxlib';
 import RouteModal from '@/components/route-modal/RouteModal';
-import { useS3Data } from '../../S3.context';
+import { useS3Data } from '../../../S3.context';
 import { getObjectStoreApiErrorMessage } from '@/lib/apiHelper';
 import { useDeleteReplication } from '@/data/hooks/replication/useDeleteReplication.hook';
 
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/edit/Edit.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/edit/[ruleId]/UpdateReplicationRule.page.tsx
similarity index 81%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/edit/Edit.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/edit/[ruleId]/UpdateReplicationRule.page.tsx
index 50f133e0b816..40d3d34398a7 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/edit/Edit.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/edit/[ruleId]/UpdateReplicationRule.page.tsx
@@ -2,25 +2,23 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { ArrowLeft } from 'lucide-react';
 import { Button, useToast } from '@datatr-ux/uxlib';
-import { useS3Data } from '../../S3.context';
+import { useS3Data } from '../../../S3.context';
 import { getObjectStoreApiErrorMessage } from '@/lib/apiHelper';
-import { ReplicationForm } from '../_components/form/ReplicationForm.component';
+import { ReplicationForm } from '../../_components/form/ReplicationForm.component';
 import { useUpdateReplication } from '@/data/hooks/replication/useUpdateReplication.hook';
-import { buildReplicationRule } from '../_components/form/buildReplicationRule';
-import { useReplicationForm } from '../_components/form/useReplicationForm.hook';
+import { buildReplicationRule } from '../../_components/form/buildReplicationRule';
+import { useReplicationForm } from '../../_components/form/useReplicationForm.hook';
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 import LinkComponent from '@/components/links/Link.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="editReplicationBreadcrumb"
-      namespace="pci-object-storage/storages/s3/replication"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="editReplicationBreadcrumb"
+    namespace="pci-object-storage/storages/s3/replication"
+  />
+);
 
-const EditReplication = () => {
+const UpdateReplicationRule = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/replication');
   const { s3 } = useS3Data();
   const toast = useToast();
@@ -94,4 +92,5 @@ const EditReplication = () => {
   );
 };
 
-export default EditReplication;
+export { breadcrumb };
+export default UpdateReplicationRule;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/new/New.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/new/CreateReplicationRule.page.tsx
similarity index 90%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/new/New.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/new/CreateReplicationRule.page.tsx
index f46147844009..4d84ec944ed2 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/new/New.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/new/CreateReplicationRule.page.tsx
@@ -11,16 +11,14 @@ import { useReplicationForm } from '../_components/form/useReplicationForm.hook'
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 import LinkComponent from '@/components/links/Link.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="addReplicationBreadcrumb"
-      namespace="pci-object-storage/storages/s3/replication"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="addReplicationBreadcrumb"
+    namespace="pci-object-storage/storages/s3/replication"
+  />
+);
 
-const CreateReplication = () => {
+const CreateReplicationRule = () => {
   const { t } = useTranslation('pci-object-storage/storages/s3/replication');
   const { s3 } = useS3Data();
   const toast = useToast();
@@ -86,4 +84,5 @@ const CreateReplication = () => {
   );
 };
 
-export default CreateReplication;
+export { breadcrumb };
+export default CreateReplicationRule;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/storage-job/StorageJob.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/storage-job/StorageJob.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/storage-job/StorageJob.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/s3/[region]/[s3Name]/replication/storage-job/StorageJob.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.page.tsx
deleted file mode 100644
index a2bfd830699c..000000000000
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/Storages.page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Outlet } from 'react-router-dom';
-import StoragesList from './_components/StorageListTable.component';
-import { useObjectStorageData } from '../ObjectStorage.context';
-
-const Storages = () => {
-  const { storages } = useObjectStorageData();
-
-  return (
-    <>
-      <StoragesList storages={storages || []} />
-      <Outlet />
-    </>
-  );
-};
-
-export default Storages;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.page.tsx
deleted file mode 100644
index 49fd150a416d..000000000000
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/s3Id/replication/Replication.page.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Outlet } from 'react-router-dom';
-import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
-
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="replicationTab"
-      namespace="pci-object-storage/storages/header-tabs"
-    />
-  );
-}
-
-const ReplicationLayout = () => {
-  return <Outlet />;
-};
-
-export default ReplicationLayout;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.context.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.context.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.context.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.context.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.spec.tsx
index b210c4cc492b..a1419bb96eb9 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.spec.tsx
@@ -23,7 +23,9 @@ const loaderParam = {
   request: new Request('https://my-api.com/endpoint'),
 };
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [mockedStorageContainer],
@@ -31,7 +33,8 @@ vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
     users: [mockedCloudUser],
     regions: [mockedRegion, mocked3AZRegion],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/swiftStorage.api', () => ({
   getSwiftStorage: vi.fn(() => mockedContainerDetail),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.layout.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.tsx
similarity index 90%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.layout.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.tsx
index 23e30596fb12..2672275277a2 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/Swift.layout.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/Swift.layout.tsx
@@ -9,7 +9,7 @@ import S3Tabs from './_components/SwiftTabs.component';
 import { getSwiftStorage } from '@/data/api/storage/swiftStorage.api';
 import { useGetSwift } from '@/data/hooks/swift-storage/useGetSwift.hook';
 import { SwiftLayoutContext } from './Swift.context';
-import Dashboard from './dashboard/Dashboard.page';
+import SwiftDashboard from './dashboard/SwiftDashboard.page';
 
 interface SwiftLayoutProps {
   params: {
@@ -33,7 +33,7 @@ export const Loader = async ({ params }: SwiftLayoutProps) => {
     );
 };
 
-function SwiftName() {
+const SwiftName = () => {
   const { projectId, swiftId } = useParams();
   if (!swiftId) return '';
   const swiftQuery = useGetSwift({
@@ -46,13 +46,11 @@ function SwiftName() {
   ) : (
     <Skeleton className="h-4 w-20 inline-block align-middle" />
   );
-}
+};
 
-export function breadcrumb() {
-  return <SwiftName />;
-}
+const breadcrumb = () => <SwiftName />;
 
-export default function SwiftLayout() {
+const SwiftLayout = () => {
   const { isUserActive } = useUserActivityContext();
   const { projectId, swiftId } = useParams();
   const swiftQuery = useGetSwift({
@@ -70,7 +68,7 @@ export default function SwiftLayout() {
       <>
         <SwiftHeader.Skeleton />
         <TabsMenu.Skeleton />
-        <Dashboard.Skeleton />
+        <SwiftDashboard.Skeleton />
       </>
     );
   }
@@ -88,4 +86,7 @@ export default function SwiftLayout() {
       </div>
     </>
   );
-}
+};
+
+export { breadcrumb };
+export default SwiftLayout;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftHeader.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftHeader.component.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftHeader.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftHeader.component.tsx
index 30bb86dd2320..9499941e564e 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftHeader.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftHeader.component.tsx
@@ -48,8 +48,7 @@ export const SwiftHeader = ({ swift }: { swift: storages.ContainerDetail }) => {
   );
 };
 
-SwiftHeader.Skeleton = function S3HeaderSkeleton() {
-  return (
+SwiftHeader.Skeleton = () => (
     <div className="flex gap-2 items-center mt-4 mb-6">
       <Skeleton className="rounded-full h-14 w-14" />
       <div>
@@ -64,4 +63,4 @@ SwiftHeader.Skeleton = function S3HeaderSkeleton() {
       </div>
     </div>
   );
-};
+
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftHeader.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftHeader.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftHeader.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftHeader.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftTabs.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftTabs.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/_components/SwiftTabs.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/_components/SwiftTabs.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.spec.tsx
similarity index 95%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.spec.tsx
index 92d0e4b89f35..7f4f2a4916d3 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.spec.tsx
@@ -4,7 +4,7 @@ import {
   mockedUsedNavigate,
   setMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
-import Dashboard, { breadcrumb as Breadcrumb } from './Dashboard.page';
+import Dashboard, { breadcrumb as Breadcrumb } from './SwiftDashboard.page';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import { mockedContainerDetail } from '@/__tests__/helpers/mocks/swift/swift';
 import { mockedRegion } from '@/__tests__/helpers/mocks/region/region';
@@ -34,7 +34,7 @@ vi.mock('@/hooks/useUser', () => ({
   useUser: () => mockedUser,
 }));
 
-describe('Dashboard', () => {
+describe('SwiftDashboard.page', () => {
   beforeEach(() => {
     vi.restoreAllMocks();
     mockedUsedNavigate();
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.tsx
similarity index 87%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.tsx
index 309d75ec5c47..f55d9be53b72 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/Dashboard.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page.tsx
@@ -10,22 +10,20 @@ import BillingSupport from '@/components/biling-support/BillingSupport.component
 import Configuration from './_components/Configuration.component';
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="dashboardTab"
-      namespace="pci-object-storage/storages/header-tabs"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="dashboardTab"
+    namespace="pci-object-storage/storages/header-tabs"
+  />
+);
 
-const Dashboard = () => {
+const SwiftDashboard = () => {
   const { swift } = useSwiftData();
   const { swiftId } = useParams();
   const { regions } = useObjectStorageData();
   const { t } = useTranslation('pci-object-storage/storages/swift');
 
-  if (!regions) return <Dashboard.Skeleton />;
+  if (!regions) return <SwiftDashboard.Skeleton />;
   return (
     <>
       <div className="flex justify-between w-full items-center">
@@ -68,7 +66,7 @@ const Dashboard = () => {
   );
 };
 
-Dashboard.Skeleton = function DashboardSkeleton() {
+SwiftDashboard.Skeleton = () => {
   return (
     <>
       <h2>Dashboard</h2>
@@ -79,4 +77,5 @@ Dashboard.Skeleton = function DashboardSkeleton() {
   );
 };
 
-export default Dashboard;
+export { breadcrumb };
+export default SwiftDashboard;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/Configuration.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/Configuration.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/Configuration.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/Configuration.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/Configuration.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/Configuration.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/Configuration.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/Configuration.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/InformationsDetails.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/InformationsDetails.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/InformationsDetails.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/InformationsDetails.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/InformationsDetails.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/InformationsDetails.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/_components/InformationsDetails.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/_components/InformationsDetails.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.spec.tsx
index ccce66b27c61..049bc6f9dee2 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.spec.tsx
@@ -8,7 +8,7 @@ import {
   resetMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import * as swiftStorageApi from '@/data/api/storage/swiftStorage.api';
-import DeleteSwiftModal from './Delete.modal';
+import DeleteSwiftModal from './DeleteSwiftStorage.modal';
 
 vi.mock('@/data/api/storage/swiftStorage.api', () => ({
   deleteSwiftStorage: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.tsx
similarity index 83%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.tsx
index dee81d66913b..80b340cd5f87 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/dashboard/delete/Delete.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal.tsx
@@ -1,5 +1,5 @@
 import { useNavigate, useParams } from 'react-router-dom';
-import DeleteStorage from '../../../_components/DeleteSwift.component';
+import DeleteStorage from '../../../../_components/storages/DeleteSwift.component';
 import { useSwiftData } from '../../Swift.context';
 
 const DeleteSwiftModal = () => {
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.spec.tsx
index f9656384ad44..fb58a86c72bc 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.spec.tsx
@@ -8,7 +8,7 @@ import {
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import storages from '@/types/Storages';
 import * as swiftApi from '@/data/api/storage/swiftStorage.api';
-import SwiftObjectsPage, { breadcrumb as Breadcrumb } from './Objects.page';
+import SwiftObjectsPage, { breadcrumb as Breadcrumb } from './ListSwiftObjects.page';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import { mockedContainerDetail } from '@/__tests__/helpers/mocks/swift/swift';
 import { useSwiftData } from '../Swift.context';
@@ -57,7 +57,9 @@ const loadingQueryMock: UseQueryResult<storages.ContainerDetail, Error> = {
   status: 'pending',
 };
 
-vi.mock('@/pages/object-storage/storage/swiftId/Swift.context');
+vi.mock(
+  '@/pages/object-storage/swift/[swiftId]/Swift.context',
+);
 
 vi.mock('@/data/api/user/user.api', () => ({
   getUsers: vi.fn(() => [mockedUser]),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.tsx
similarity index 91%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.tsx
index a299269354e0..5b072b8c05f0 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/Objects.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page.tsx
@@ -10,16 +10,14 @@ import RefreshButton from '@/components/refresh-button/RefreshButton.component';
 import BreadcrumbItem from '@/components/breadcrumb/BreadcrumbItem.component';
 import SimpleSearchBar from '@/components/simple-search-bar/SimpleSearchBar.component';
 
-export function breadcrumb() {
-  return (
-    <BreadcrumbItem
-      translationKey="objectsTab"
-      namespace="pci-object-storage/storages/header-tabs"
-    />
-  );
-}
+const breadcrumb = () => (
+  <BreadcrumbItem
+    translationKey="objectsTab"
+    namespace="pci-object-storage/storages/header-tabs"
+  />
+);
 
-const SwiftObjectsPage = () => {
+const ListSwiftObjects = () => {
   const { t } = useTranslation([
     'pci-object-storage/storages/swift/objects',
     'pci-object-storage/storages/s3/objects',
@@ -75,4 +73,5 @@ const SwiftObjectsPage = () => {
   );
 };
 
-export default SwiftObjectsPage;
+export { breadcrumb };
+export default ListSwiftObjects;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectBrowser.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectBrowser.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectBrowser.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectBrowser.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectBrowser.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectBrowser.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectBrowser.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectBrowser.spec.tsx
index 6e2a6efca7a8..47c96c04231d 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectBrowser.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectBrowser.spec.tsx
@@ -18,13 +18,16 @@ const mockedSwiftWithMatchingRegion: storages.ContainerDetail = {
   region: 'BHS', // Match the region in mockedContainerAccess
 };
 
-vi.mock('@/pages/object-storage/storage/swiftId/Swift.context', () => ({
+vi.mock(
+  '@/pages/object-storage/swift/[swiftId]/Swift.context',
+  () => ({
   useSwiftData: vi.fn(() => ({
     projectId: 'projectId',
     swift: mockedSwiftWithMatchingRegion,
     swiftQuery: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/hooks/useLocale', () => ({
   useLocale: () => 'fr_FR',
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectDropFile.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectDropFile.component.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectDropFile.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectDropFile.component.tsx
index cc5c76a51325..eb9c5b140887 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectDropFile.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectDropFile.component.tsx
@@ -8,7 +8,7 @@ import {
 import { useTranslation } from 'react-i18next';
 import AddSwiftObjectForm from '../add/AddSwiftObjectForm.component';
 import FileUploadPending from '@/components/file-input/FileUploadPending.component';
-import { useAddSwiftObjectForm } from '../add/useAddSwiftObjectForm.component';
+import { useAddSwiftObjectForm } from '../add/useAddSwiftObjectForm.hook';
 
 export interface DroppedFiles {
   files: File[];
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectFileRenderer.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectFileRenderer.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/_components/SwiftObjectFileRenderer.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/_components/SwiftObjectFileRenderer.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/add.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/add.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.spec.tsx
index b9ccdc3e58b1..03a3babf569b 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/add.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.spec.tsx
@@ -15,7 +15,7 @@ import {
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import * as storagesApi from '@/data/api/storage/storages.api';
 import * as swiftStorageApi from '@/data/api/storage/swiftStorage.api';
-import AddObjectModal from './Add.modal';
+import AddObjectModal from './AddSwiftObject.modal';
 import { mockedContainerDetail } from '@/__tests__/helpers/mocks/swift/swift';
 import { mockedContainerAccess } from '@/__tests__/helpers/mocks/storageContainer/access';
 import storages from '@/types/Storages';
@@ -26,13 +26,16 @@ const mockedSwiftWithMatchingRegion: storages.ContainerDetail = {
   region: 'BHS', // Match the region in mockedContainerAccess
 };
 
-vi.mock('@/pages/object-storage/storage/swiftId/Swift.context', () => ({
+vi.mock(
+  '@/pages/object-storage/swift/[swiftId]/Swift.context',
+  () => ({
   useSwiftData: vi.fn(() => ({
     projectId: 'projectId',
     swift: mockedSwiftWithMatchingRegion,
     swiftQuery: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/storages.api', () => ({
   getStorageAccess: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/Add.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.tsx
similarity index 95%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/Add.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.tsx
index b5d935c231f6..a002d2f99fb4 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/Add.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal.tsx
@@ -6,7 +6,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@datatr-ux/uxlib';
-import { useAddSwiftObjectForm } from './useAddSwiftObjectForm.component';
+import { useAddSwiftObjectForm } from './useAddSwiftObjectForm.hook';
 import RouteModal from '@/components/route-modal/RouteModal';
 import FileUploadPending from '@/components/file-input/FileUploadPending.component';
 import AddSwiftObjectForm from './AddSwiftObjectForm.component';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/AddSwiftObjectForm.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObjectForm.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/AddSwiftObjectForm.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObjectForm.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/useAddSwiftObjectForm.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/useAddSwiftObjectForm.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/add/useAddSwiftObjectForm.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/add/useAddSwiftObjectForm.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal.spec.tsx
index 248dca45d2c4..ed8d4364f209 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal.spec.tsx
@@ -16,7 +16,7 @@ import {
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import * as storagesApi from '@/data/api/storage/storages.api';
 import * as swiftStorageApi from '@/data/api/storage/swiftStorage.api';
-import DeleteSwiftObject from './DeleteObject.modal';
+import DeleteSwiftObject from './DeleteSwiftObject.modal';
 import { mockedContainerDetail } from '@/__tests__/helpers/mocks/swift/swift';
 import { mockedContainerAccess } from '@/__tests__/helpers/mocks/storageContainer/access';
 import storages from '@/types/Storages';
@@ -28,13 +28,16 @@ const mockedSwiftWithMatchingRegion: storages.ContainerDetail = {
   region: 'BHS', // Match the region in mockedContainerAccess
 };
 
-vi.mock('@/pages/object-storage/storage/swiftId/Swift.context', () => ({
+vi.mock(
+  '@/pages/object-storage/swift/[swiftId]/Swift.context',
+  () => ({
   useSwiftData: vi.fn(() => ({
     projectId: 'projectId',
     swift: mockedSwiftWithMatchingRegion,
     swiftQuery: { isLoading: false },
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/storage/storages.api', () => ({
   getStorageAccess: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/switch-type/SwitchType.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/switch-type/[containerId]/SwitchType.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/switch-type/SwitchType.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/switch-type/[containerId]/SwitchType.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/switch-type/SwitchType.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/switch-type/[containerId]/SwitchType.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/switch-type/SwitchType.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/switch-type/[containerId]/SwitchType.spec.tsx
index e03c5e094fd1..00be776ede84 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/storage/switch-type/SwitchType.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/switch-type/[containerId]/SwitchType.spec.tsx
@@ -18,14 +18,17 @@ import {
 } from '@/__tests__/helpers/mockRouterDomHelper';
 import SwithType from './SwitchType.modal';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/hooks/swift-storage/useGetSwift.hook', () => ({
   useGetSwift: vi.fn(() => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/Users.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/ListUsers.page.spec.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/Users.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/ListUsers.page.spec.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/Users.page.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/ListUsers.page.tsx
similarity index 92%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/Users.page.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/ListUsers.page.tsx
index 0588f9b16d55..33a7696f7e5a 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/Users.page.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/ListUsers.page.tsx
@@ -4,7 +4,7 @@ import { POLLING } from '@/configuration/polling.constants';
 import { useGetUsers } from '@/data/hooks/user/useGetUsers.hook';
 import UsersList from './_components/UserListTable.component';
 
-const Users = () => {
+const ListUsers = () => {
   const { projectId } = useParams();
   const { isUserActive } = useUserActivityContext();
 
@@ -21,4 +21,4 @@ const Users = () => {
   );
 };
 
-export default Users;
+export default ListUsers;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UsertListColumns.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListColumns.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UsertListColumns.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListColumns.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListTable.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListTable.component.tsx
index 769e795902e3..ab75f1545b09 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListTable.component.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/UserListTable.component.tsx
@@ -3,7 +3,7 @@ import { ColumnDef } from '@tanstack/react-table';
 import { Plus } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 import { Skeleton, Button, useToast } from '@datatr-ux/uxlib';
-import { useGetColumns } from './UsertListColumns.component';
+import { useGetColumns } from './UserListColumns.component';
 import DataTable from '@/components/data-table';
 import { useGetFilters } from './UserListFilters.component';
 import user from '@/types/User';
@@ -15,7 +15,7 @@ interface UsersListProps {
   users: user.User[];
 }
 
-export default function UsersList({ users }: UsersListProps) {
+const UsersList = ({ users }: UsersListProps) => {
   const { t } = useTranslation('pci-object-storage/users');
   const { projectId } = useObjectStorageData();
   const navigate = useNavigate();
@@ -83,22 +83,22 @@ export default function UsersList({ users }: UsersListProps) {
       <DataTable.Pagination />
     </DataTable.Provider>
   );
-}
+};
 
-UsersList.Skeleton = function UsersListSkeleton() {
-  return (
-    <>
-      <div
-        data-testid="users-list-table-skeleton"
-        className="flex justify-between w-100 mb-2 items-end"
-      >
+UsersList.Skeleton = () => (
+  <>
+    <div
+      data-testid="users-list-table-skeleton"
+      className="flex justify-between w-100 mb-2 items-end"
+    >
+      <Skeleton className="h-10 w-48" />
+      <div className="flex">
         <Skeleton className="h-10 w-48" />
-        <div className="flex">
-          <Skeleton className="h-10 w-48" />
-          <Skeleton className="h-10 w-12 ml-2" />
-        </div>
+        <Skeleton className="h-10 w-12 ml-2" />
       </div>
-      <DataTable.Skeleton columns={5} rows={10} width={100} height={16} />
-    </>
-  );
-};
+    </div>
+    <DataTable.Skeleton columns={5} rows={10} width={100} height={16} />
+  </>
+);
+
+export default UsersList;
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/useGetUserAccess.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/useGetUserAccess.hook.tsx
index 60ef9561812d..245b7a6ed274 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/useGetUserAccess.hook.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/_components/useGetUserAccess.hook.tsx
@@ -1,7 +1,7 @@
 import { useParams } from 'react-router-dom';
 import { useGetUserS3Credentials } from '@/data/hooks/user/useGetUserS3Credentials.hook';
 
-export function useGetUserAccess(userId: number) {
+const useGetUserAccess = (userId: number) => {
   const { projectId } = useParams();
   const query = useGetUserS3Credentials(projectId, userId);
 
@@ -11,4 +11,6 @@ export function useGetUserAccess(userId: number) {
     ...query,
     access,
   };
-}
+};
+
+export { useGetUserAccess };
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/Create.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/CreateUser.modal.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/Create.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/CreateUser.modal.spec.tsx
index ae27d241c888..8f113b7ad3a5 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/Create.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/CreateUser.modal.spec.tsx
@@ -8,7 +8,7 @@ import {
 } from '@testing-library/react';
 import { useToast } from '@datatr-ux/uxlib';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
-import CreateUser from './Create.modal';
+import CreateUser from './CreateUser.modal';
 import * as userAPI from '@/data/api/user/user.api';
 import {
   mockedCloudUser,
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/Create.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/CreateUser.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/Create.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/create/CreateUser.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/delete/Delete.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/disable/DisableUser.modal.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/delete/Delete.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/disable/DisableUser.modal.spec.tsx
index 69d0c336620b..e84ad03f7d83 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/delete/Delete.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/disable/DisableUser.modal.spec.tsx
@@ -18,7 +18,7 @@ import {
   mockedUsedNavigate,
   setMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
-import DeleteUser from './Delete.modal';
+import DeleteUser from './DisableUser.modal';
 
 vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
   useObjectStorageData: vi.fn(() => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/delete/Delete.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/disable/DisableUser.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/delete/Delete.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/disable/DisableUser.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enableS3/EnableS3.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enable/EnableUserS3.modal.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enableS3/EnableS3.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enable/EnableUserS3.modal.spec.tsx
index 046a8bf840ff..540da1b4dd67 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enableS3/EnableS3.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enable/EnableUserS3.modal.spec.tsx
@@ -17,7 +17,7 @@ import {
   mockedUsedNavigate,
   setMockedUseParams,
 } from '@/__tests__/helpers/mockRouterDomHelper';
-import EnableUser from './EnableS3.modal';
+import EnableUser from './EnableUserS3.modal';
 import * as userAPI from '@/data/api/user/user.api';
 
 vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enableS3/EnableS3.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enable/EnableUserS3.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enableS3/EnableS3.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/enable/EnableUserS3.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/ImportPolicy.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal.spec.tsx
similarity index 98%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/ImportPolicy.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal.spec.tsx
index 573edba4b59a..0b448b7e7d25 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/ImportPolicy.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal.spec.tsx
@@ -20,14 +20,17 @@ import ImportPolicyModal from './ImportPolicy.modal';
 
 let mockedPolicies: File[] = [];
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('@/data/api/user/user.api', () => ({
   addUserPolicy: vi.fn(),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/ImportPolicy.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/ImportPolicy.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.spec.tsx
similarity index 97%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.spec.tsx
index c5585b1388e9..735ed779498c 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.spec.tsx
@@ -18,7 +18,9 @@ import { handleSelectComboboxText } from '@/__tests__/helpers/unitTestHelper';
 
 const downloadMock = vi.fn();
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
@@ -26,7 +28,8 @@ vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
     users: [mockedCloudUser],
     regions: [mockedRegion],
   })),
-}));
+  }),
+);
 
 vi.mock('@/hooks/useLocale', () => ({
   useLocale: vi.fn(() => 'fr_FR'),
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.tsx
similarity index 99%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.tsx
index d86f1642af7f..3c6b77114ec4 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/Rclone.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/Rclone.modal.tsx
@@ -25,7 +25,7 @@ import {
 } from '@datatr-ux/uxlib';
 import { ExternalLink } from 'lucide-react';
 import RouteModal from '@/components/route-modal/RouteModal';
-import { useObjectStorageData } from '../../ObjectStorage.context';
+import { useObjectStorageData } from '../../../ObjectStorage.context';
 import { useRcloneForm } from './formRclone/useRcloneForm.hook';
 import { ObjectStorageTypeEnum } from '@/types/Storages';
 import user from '@/types/User';
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/formRclone/useRcloneForm.hook.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/formRclone/useRcloneForm.hook.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/formRclone/useRcloneForm.hook.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/rclone/[userId]/formRclone/useRcloneForm.hook.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.spec.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.spec.tsx
similarity index 96%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.spec.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.spec.tsx
index 644baf8341b8..e23edf114b37 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.spec.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.spec.tsx
@@ -11,14 +11,17 @@ import {
 } from '@/__tests__/helpers/mocks/cloudUser/user';
 import { mockedObjStoError } from '@/__tests__/helpers/apiError';
 
-vi.mock('@/pages/object-storage/ObjectStorage.context', () => ({
+vi.mock(
+  '@/pages/object-storage/ObjectStorage.context',
+  () => ({
   useObjectStorageData: vi.fn(() => ({
     projectId: 'projectId',
     storages: [],
     storagesQuery: { isLoading: false },
     users: [mockedCloudUser],
   })),
-}));
+  }),
+);
 
 vi.mock('react-router-dom', async () => {
   const mod = await vi.importActual('react-router-dom');
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.modal.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.tsx
similarity index 92%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.modal.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.tsx
index d2485bce66a9..514af8c8ad36 100644
--- a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/ShowSecretKey.modal.tsx
+++ b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal.tsx
@@ -1,6 +1,6 @@
 import { useNavigate, useParams } from 'react-router-dom';
 import RouteModal from '@/components/route-modal/RouteModal';
-import { useObjectStorageData } from '../../ObjectStorage.context';
+import { useObjectStorageData } from '../../../ObjectStorage.context';
 import UserSecretKey from './_components/UserSecretKey.component';
 import { useGetUserS3Credentials } from '@/data/hooks/user/useGetUserS3Credentials.hook';
 
diff --git a/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/_components/UserSecretKey.component.tsx b/packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/_components/UserSecretKey.component.tsx
similarity index 100%
rename from packages/manager/apps/pci-object-storage/src/pages/object-storage/users/show-secret/_components/UserSecretKey.component.tsx
rename to packages/manager/apps/pci-object-storage/src/pages/object-storage/users/user-secret/[userId]/_components/UserSecretKey.component.tsx
diff --git a/packages/manager/apps/pci-object-storage/src/routes/routes.tsx b/packages/manager/apps/pci-object-storage/src/routes/routes.tsx
index 4824daa9d2a0..f4d7429a6ca0 100644
--- a/packages/manager/apps/pci-object-storage/src/routes/routes.tsx
+++ b/packages/manager/apps/pci-object-storage/src/routes/routes.tsx
@@ -24,7 +24,7 @@ export const COMMON_PATH = '/pci/projects';
 export default [
   {
     path: '/pci/projects/:projectId/storages/objects',
-    ...lazyLoadRoute(() => import('@/pages/Root.layout')),
+    ...lazyLoadRoute(() => import('@/pages/object-storage/Root.layout')),
     children: [
       {
         path: '',
@@ -37,7 +37,7 @@ export default [
             path: '',
             id: 'storages',
             ...lazyLoadRoute(() =>
-              import('@/pages/object-storage/storage/Storages.page'),
+              import('@/pages/object-storage/ListObjectStorages.page'),
             ),
             children: [
               {
@@ -45,7 +45,7 @@ export default [
                 id: 'storages.switch-type',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/switch-type/SwitchType.modal'
+                    '@/pages/object-storage/switch-type/[containerId]/SwitchType.modal'
                   ),
                 ),
               },
@@ -54,7 +54,7 @@ export default [
                 id: 'storages.add-s3-user',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/add-user-s3/AddUserS3.modal'
+                    '@/pages/object-storage/add-s3-user/[storageType]/[storageId]/[region]/AddUserS3.modal'
                   ),
                 ),
               },
@@ -63,7 +63,7 @@ export default [
                 id: 's3.delete',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/deleteS3/DeleteS3.modal'
+                    '@/pages/object-storage/delete/[storageId]/[region]/DeleteS3.modal'
                   ),
                 ),
               },
@@ -72,7 +72,7 @@ export default [
                 id: 'swift.delete',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/deleteSwift/DeleteSwift.modal'
+                    '@/pages/object-storage/delete/[swiftId]/DeleteSwift.modal'
                   ),
                 ),
               },
@@ -82,14 +82,16 @@ export default [
             path: 'users',
             id: 'users',
             ...lazyLoadRoute(() =>
-              import('@/pages/object-storage/users/Users.page'),
+              import('@/pages/object-storage/users/ListUsers.page'),
             ),
             children: [
               {
                 path: 'create',
                 id: 'users.create',
                 ...lazyLoadRoute(() =>
-                  import('@/pages/object-storage/users/create/Create.modal'),
+                  import(
+                    '@/pages/object-storage/users/create/CreateUser.modal'
+                  ),
                 ),
               },
               {
@@ -97,7 +99,7 @@ export default [
                 id: 'users.secret',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/users/show-secret/ShowSecretKey.modal'
+                    '@/pages/object-storage/users/user-secret/[userId]/ShowSecretKey.modal'
                   ),
                 ),
               },
@@ -105,7 +107,9 @@ export default [
                 path: 'rclone/:userId',
                 id: 'users.rclone',
                 ...lazyLoadRoute(() =>
-                  import('@/pages/object-storage/users/rclone/Rclone.modal'),
+                  import(
+                    '@/pages/object-storage/users/rclone/[userId]/Rclone.modal'
+                  ),
                 ),
               },
               {
@@ -113,7 +117,7 @@ export default [
                 id: 'users.import-policy',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/users/import-policy/ImportPolicy.modal'
+                    '@/pages/object-storage/users/import-policy/[userId]/ImportPolicy.modal'
                   ),
                 ),
               },
@@ -122,7 +126,7 @@ export default [
                 id: 'users.enable',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/users/enableS3/EnableS3.modal'
+                    '@/pages/object-storage/users/enable/EnableUserS3.modal'
                   ),
                 ),
               },
@@ -130,7 +134,9 @@ export default [
                 path: 'disable/:userId',
                 id: 'users.disable',
                 ...lazyLoadRoute(() =>
-                  import('@/pages/object-storage/users/delete/Delete.modal'),
+                  import(
+                    '@/pages/object-storage/users/disable/DisableUser.modal'
+                  ),
                 ),
               },
             ],
@@ -148,13 +154,13 @@ export default [
         path: 'new',
         id: 'create',
         ...lazyLoadRoute(() =>
-          import('@/pages/object-storage/create/Create.page'),
+          import('@/pages/object-storage/new/CreateObjectStorage.page'),
         ),
       },
       {
         path: 'swift/:swiftId',
         ...lazyLoadRoute(() =>
-          import('@/pages/object-storage/storage/swiftId/Swift.layout'),
+          import('@/pages/object-storage/swift/[swiftId]/Swift.layout'),
         ),
         children: [
           {
@@ -162,7 +168,7 @@ export default [
             id: 'swift.dashboard',
             ...lazyLoadRoute(() =>
               import(
-                '@/pages/object-storage/storage/swiftId/dashboard/Dashboard.page'
+                '@/pages/object-storage/swift/[swiftId]/dashboard/SwiftDashboard.page'
               ),
             ),
             children: [
@@ -171,7 +177,7 @@ export default [
                 id: 'swift.dashboard.delete',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/swiftId/dashboard/delete/Delete.modal'
+                    '@/pages/object-storage/swift/[swiftId]/dashboard/delete/DeleteSwiftStorage.modal'
                   ),
                 ),
               },
@@ -182,7 +188,7 @@ export default [
             id: 'swift.dashboard.objects',
             ...lazyLoadRoute(() =>
               import(
-                '@/pages/object-storage/storage/swiftId/objects/Objects.page'
+                '@/pages/object-storage/swift/[swiftId]/objects/ListSwiftObjects.page'
               ),
             ),
             children: [
@@ -191,7 +197,7 @@ export default [
                 id: 'swift.dashboard.objects.delete',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/swiftId/objects/delete/DeleteObject.modal'
+                    '@/pages/object-storage/swift/[swiftId]/objects/delete/DeleteSwiftObject.modal'
                   ),
                 ),
               },
@@ -200,7 +206,7 @@ export default [
                 id: 'swift.dashboard.objects.add',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/swiftId/objects/add/Add.modal'
+                    '@/pages/object-storage/swift/[swiftId]/objects/add/AddSwiftObject.modal'
                   ),
                 ),
               },
@@ -211,7 +217,7 @@ export default [
       {
         path: 's3/:region/:s3Name',
         ...lazyLoadRoute(() =>
-          import('@/pages/object-storage/storage/s3Id/S3.layout'),
+          import('@/pages/object-storage/s3/[region]/[s3Name]/S3.layout'),
         ),
         children: [
           {
@@ -222,7 +228,7 @@ export default [
             path: 'objects',
             ...lazyLoadRoute(() =>
               import(
-                '@/pages/object-storage/storage/s3Id/objects/Objects.layout'
+                '@/pages/object-storage/s3/[region]/[s3Name]/objects/S3Objects.layout'
               ),
             ),
             children: [
@@ -231,7 +237,7 @@ export default [
                 id: 's3.objects.list',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/objects/Objects.page'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/objects/ListS3Objects.page'
                   ),
                 ),
                 children: [
@@ -240,7 +246,7 @@ export default [
                     id: 's3.objects.add',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/add/Add.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/add/AddS3Object.modal'
                       ),
                     ),
                   },
@@ -249,7 +255,7 @@ export default [
                     id: 's3.objects.restore',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/restore/Restore.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/restore/RestoreS3ObjectFromList.modal'
                       ),
                     ),
                   },
@@ -258,7 +264,7 @@ export default [
                     id: 's3.objects.delete',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/delete/DeleteObject.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/delete/DeleteS3Object.modal'
                       ),
                     ),
                   },
@@ -267,7 +273,7 @@ export default [
                     id: 's3.object.version.delete',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/object/versions/delete/DeleteObjectVersion.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/delete/DeleteS3ObjectVersion.modal'
                       ),
                     ),
                   },
@@ -276,7 +282,7 @@ export default [
                     id: 's3.objects.bulk-delete',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/bulk-delete/BulkDeleteObjects.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/bulk-delete/BulkDeleteS3Objects.modal'
                       ),
                     ),
                   },
@@ -286,7 +292,7 @@ export default [
                 path: 'object',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/objects/object/Object.layout'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.layout'
                   ),
                 ),
                 children: [
@@ -295,7 +301,7 @@ export default [
                     id: 's3.object.dashboard',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/object/Object.page'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/S3Object.page'
                       ),
                     ),
                     children: [
@@ -304,7 +310,7 @@ export default [
                         id: 's3.object.change-storage-class',
                         ...lazyLoadRoute(() =>
                           import(
-                            '@/pages/object-storage/storage/s3Id/objects/object/change-storage-class/ChangeStorageClass.modal'
+                            '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/change-storage-class/ChangeS3ObjectStorageClass.modal'
                           ),
                         ),
                       },
@@ -313,7 +319,7 @@ export default [
                         id: 's3.object.delete',
                         ...lazyLoadRoute(() =>
                           import(
-                            '@/pages/object-storage/storage/s3Id/objects/delete/DeleteObject.modal'
+                            '@/pages/object-storage/s3/[region]/[s3Name]/objects/delete/DeleteS3Object.modal'
                           ),
                         ),
                       },
@@ -322,7 +328,7 @@ export default [
                         id: 's3.object.restore',
                         ...lazyLoadRoute(() =>
                           import(
-                            '@/pages/object-storage/storage/s3Id/objects/object/restore/Restore.modal'
+                            '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/restore/RestoreS3Object.modal'
                           ),
                         ),
                       },
@@ -333,7 +339,7 @@ export default [
                     id: 's3.object.versions',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/objects/object/versions/Versions.page'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/S3ObjectVersions.page'
                       ),
                     ),
                     children: [
@@ -342,7 +348,7 @@ export default [
                         id: 'versions.delete',
                         ...lazyLoadRoute(() =>
                           import(
-                            '@/pages/object-storage/storage/s3Id/objects/object/versions/delete/DeleteObjectVersion.modal'
+                            '@/pages/object-storage/s3/[region]/[s3Name]/objects/object/versions/delete/DeleteS3ObjectVersion.modal'
                           ),
                         ),
                       },
@@ -351,7 +357,7 @@ export default [
                         id: 'versions.bulk-delete',
                         ...lazyLoadRoute(() =>
                           import(
-                            '@/pages/object-storage/storage/s3Id/objects/bulk-delete/BulkDeleteObjects.modal'
+                            '@/pages/object-storage/s3/[region]/[s3Name]/objects/bulk-delete/BulkDeleteS3Objects.modal'
                           ),
                         ),
                       },
@@ -366,7 +372,7 @@ export default [
             id: 's3.dashboard.properties',
             ...lazyLoadRoute(() =>
               import(
-                '@/pages/object-storage/storage/s3Id/dashboard/Dashboard.page'
+                '@/pages/object-storage/s3/[region]/[s3Name]/dashboard/S3Dashboard.page'
               ),
             ),
             children: [
@@ -375,7 +381,7 @@ export default [
                 id: 's3.dashboard.delete',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/dashboard/delete/Delete.modal'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/dashboard/delete/DeleteS3Storage.modal'
                   ),
                 ),
               },
@@ -384,7 +390,7 @@ export default [
                 id: 'settings.encryption',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/dashboard/_components/activate-encryption/ActivateEncryption.modal'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-encryption/ActivateEncryption.modal'
                   ),
                 ),
               },
@@ -393,7 +399,7 @@ export default [
                 id: 'settings.versionning',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/dashboard/_components/activate-versionning/ActivateVersionning.modal'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/activate-versionning/ActivateVersionning.modal'
                   ),
                 ),
               },
@@ -402,7 +408,7 @@ export default [
                 id: 'settings.object-lock',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/dashboard/_components/object-lock-options/ObjectLockOptions.sheet'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/dashboard/_components/object-lock-options/ObjectLockOptions.modal'
                   ),
                 ),
               },
@@ -413,7 +419,7 @@ export default [
             id: 's3.dashboard.replication',
             ...lazyLoadRoute(() =>
               import(
-                '@/pages/object-storage/storage/s3Id/replication/Replication.page'
+                '@/pages/object-storage/s3/[region]/[s3Name]/replication/Replication.page'
               ),
             ),
             children: [
@@ -421,7 +427,7 @@ export default [
                 id: 'replication.list',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/replication/list/List.page'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/replication/ListReplicationRules.page'
                   ),
                 ),
                 children: [
@@ -433,7 +439,7 @@ export default [
                     id: 'replication.delete',
                     ...lazyLoadRoute(() =>
                       import(
-                        '@/pages/object-storage/storage/s3Id/replication/delete/Delete.modal'
+                        '@/pages/object-storage/s3/[region]/[s3Name]/replication/delete/[ruleId]/DeleteReplicationRule.modal'
                       ),
                     ),
                   },
@@ -444,7 +450,7 @@ export default [
                 id: 'replication.new',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/replication/new/New.page'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/replication/new/CreateReplicationRule.page'
                   ),
                 ),
               },
@@ -453,7 +459,7 @@ export default [
                 id: 'replication.edit',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/replication/edit/Edit.page'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/replication/edit/[ruleId]/UpdateReplicationRule.page'
                   ),
                 ),
               },
@@ -462,7 +468,7 @@ export default [
                 id: 'replication.storage-job',
                 ...lazyLoadRoute(() =>
                   import(
-                    '@/pages/object-storage/storage/s3Id/replication/storage-job/StorageJob.modal'
+                    '@/pages/object-storage/s3/[region]/[s3Name]/replication/storage-job/StorageJob.modal'
                   ),
                 ),
               },
diff --git a/packages/manager/apps/pci-object-storage/vitest.config.js b/packages/manager/apps/pci-object-storage/vitest.config.js
index a452b01fab6f..18207e22682d 100644
--- a/packages/manager/apps/pci-object-storage/vitest.config.js
+++ b/packages/manager/apps/pci-object-storage/vitest.config.js
@@ -39,5 +39,3 @@ export default mergeConfig(
     },
   }),
 );
-
-