diff --git a/src/components/layout/header/Header.tsx b/src/components/layout/header/Header.tsx
index 21f0cd648..c70fa7128 100644
--- a/src/components/layout/header/Header.tsx
+++ b/src/components/layout/header/Header.tsx
@@ -4,7 +4,7 @@ import { CURRENT_VERSION, REPO_URL } from '../../../../data/constants';
 import { useConfigContext } from '../../../config/provider';
 import { Logo } from '../Logo';
 import { useCardStyles } from '../useCardStyles';
-import DockerMenuButton from './Actions/Docker/DockerModule';
+import DockerMenuButton from '../../../modules/Docker/DockerModule';
 import { ToggleEditModeAction } from './Actions/ToggleEditMode/ToggleEditMode';
 import { Search } from './Search';
 import { SettingsMenu } from './SettingsMenu';
diff --git a/src/components/layout/header/Actions/Docker/ContainerActionBar.tsx b/src/modules/Docker/ContainerActionBar.tsx
similarity index 94%
rename from src/components/layout/header/Actions/Docker/ContainerActionBar.tsx
rename to src/modules/Docker/ContainerActionBar.tsx
index ca2036c07..5a0ad3efd 100644
--- a/src/components/layout/header/Actions/Docker/ContainerActionBar.tsx
+++ b/src/modules/Docker/ContainerActionBar.tsx
@@ -16,11 +16,11 @@ import { useTranslation } from 'next-i18next';
 import { useState } from 'react';
 import { TFunction } from 'react-i18next';
 import { v4 as uuidv4 } from 'uuid';
-import { useConfigContext } from '../../../../../config/provider';
-import { tryMatchService } from '../../../../../tools/addToHomarr';
-import { openContextModalGeneric } from '../../../../../tools/mantineModalManagerExtensions';
-import { AppType } from '../../../../../types/app';
-import { appTileDefinition } from '../../../../Dashboard/Tiles/Apps/AppTile';
+import { useConfigContext } from '../../config/provider';
+import { tryMatchService } from '../../tools/addToHomarr';
+import { openContextModalGeneric } from '../../tools/mantineModalManagerExtensions';
+import { AppType } from '../../types/app';
+import { appTileDefinition } from '../../components/Dashboard/Tiles/Apps/AppTile';
 
 let t: TFunction<'modules/docker', undefined>;
 
diff --git a/src/components/layout/header/Actions/Docker/ContainerState.tsx b/src/modules/Docker/ContainerState.tsx
similarity index 100%
rename from src/components/layout/header/Actions/Docker/ContainerState.tsx
rename to src/modules/Docker/ContainerState.tsx
diff --git a/src/components/layout/header/Actions/Docker/DockerModule.tsx b/src/modules/Docker/DockerModule.tsx
similarity index 97%
rename from src/components/layout/header/Actions/Docker/DockerModule.tsx
rename to src/modules/Docker/DockerModule.tsx
index c8c916b28..54704ec3c 100644
--- a/src/components/layout/header/Actions/Docker/DockerModule.tsx
+++ b/src/modules/Docker/DockerModule.tsx
@@ -5,7 +5,7 @@ import axios from 'axios';
 import Docker from 'dockerode';
 import { useTranslation } from 'next-i18next';
 import { useEffect, useState } from 'react';
-import { useConfigContext } from '../../../../../config/provider';
+import { useConfigContext } from '../../config/provider';
 
 import ContainerActionBar from './ContainerActionBar';
 import DockerTable from './DockerTable';
diff --git a/src/components/layout/header/Actions/Docker/DockerTable.tsx b/src/modules/Docker/DockerTable.tsx
similarity index 100%
rename from src/components/layout/header/Actions/Docker/DockerTable.tsx
rename to src/modules/Docker/DockerTable.tsx
diff --git a/src/pages/api/modules/overseerr/[id].tsx b/src/pages/api/modules/overseerr/[id].tsx
index 3b0240271..55d253400 100644
--- a/src/pages/api/modules/overseerr/[id].tsx
+++ b/src/pages/api/modules/overseerr/[id].tsx
@@ -3,7 +3,7 @@ import { getCookie } from 'cookies-next';
 import axios from 'axios';
 import Consola from 'consola';
 import { getConfig } from '../../../../tools/config/getConfig';
-import { MediaType } from '../../../../modules/overseerr/SearchResult';
+import type { MediaType } from '../../../../modules/overseerr/SearchResult';
 
 async function Get(req: NextApiRequest, res: NextApiResponse) {
   // Get the slug of the request