diff --git a/app/components/AsyncBlock.vue b/app/components/async/AsyncBlock.vue
similarity index 62%
rename from app/components/AsyncBlock.vue
rename to app/components/async/AsyncBlock.vue
index 3cba9e10..cd5f860c 100644
--- a/app/components/AsyncBlock.vue
+++ b/app/components/async/AsyncBlock.vue
@@ -1,6 +1,6 @@
 <template>
-	<BlockLoading v-if="status === 'pending'"/>
-	<BlockError v-else-if="status === 'error'"/>
+	<AsyncBlockLoading v-if="status === 'pending'"/>
+	<AsyncBlockError v-else-if="status === 'error'"/>
 
 	<div v-else>
 		<slot/>
diff --git a/app/components/BlockError.vue b/app/components/async/AsyncBlockError.vue
similarity index 100%
rename from app/components/BlockError.vue
rename to app/components/async/AsyncBlockError.vue
diff --git a/app/components/BlockLoading.vue b/app/components/async/AsyncBlockLoading.vue
similarity index 100%
rename from app/components/BlockLoading.vue
rename to app/components/async/AsyncBlockLoading.vue
diff --git a/app/components/AsyncCell.vue b/app/components/async/AsyncCell.vue
similarity index 100%
rename from app/components/AsyncCell.vue
rename to app/components/async/AsyncCell.vue
diff --git a/app/components/AsyncRow.vue b/app/components/async/AsyncRow.vue
similarity index 100%
rename from app/components/AsyncRow.vue
rename to app/components/async/AsyncRow.vue
diff --git a/app/components/credits/CreditsFilters.vue b/app/components/credits/CreditsFilters.vue
index 857b32a3..8bafd0d4 100644
--- a/app/components/credits/CreditsFilters.vue
+++ b/app/components/credits/CreditsFilters.vue
@@ -31,7 +31,7 @@
 	import debounce from 'lodash/debounce';
 	import isEqual from 'lodash/isEqual';
 	import { FIELD_LABELS, TYPE_REASONS, useCreditsFilters } from '~/composables/useCreditsFilters';
-	import { buildNodesByKey, renderTreeSelectValue } from '~/utils/tree-select.ts';
+	import { buildNodesByKey, renderTreeSelectValue } from '~/utils/tree-select';
 
 	const { filter, onParamChange, key: creditsFilterKey } = useCreditsFilters();
 
diff --git a/app/components/GPDialog.vue b/app/components/gp-dialog/GPDialog.vue
similarity index 100%
rename from app/components/GPDialog.vue
rename to app/components/gp-dialog/GPDialog.vue
diff --git a/app/components/AddCredits.vue b/app/components/gp-dialog/content/AddCredits.vue
similarity index 100%
rename from app/components/AddCredits.vue
rename to app/components/gp-dialog/content/AddCredits.vue
diff --git a/app/components/AdoptProbe.vue b/app/components/gp-dialog/content/AdoptProbe.vue
similarity index 99%
rename from app/components/AdoptProbe.vue
rename to app/components/gp-dialog/content/AdoptProbe.vue
index 4fd22562..20eb3de5 100644
--- a/app/components/AdoptProbe.vue
+++ b/app/components/gp-dialog/content/AdoptProbe.vue
@@ -107,11 +107,11 @@
 							<!-- inline-block is required so mt-2 is not collapsed -->
 							<p class="mb-4 mt-2 inline-block text-lg font-bold">Configure the probe</p>
 							<p>Recreate the container by running the following commands. The new container will be automatically bound to your account.</p>
-							<StartProbeCommands :adopt="true" :recreate="true"/>
+							<ProbeStartCommands :adopt="true" :recreate="true"/>
 						</TabPanel>
 						<TabPanel value="1">
 							<p class="mb-4 mt-2 inline-block text-lg font-bold">Join the network</p>
-							<StartProbe :adopt="true"/>
+							<GpDialogContentStartProbe :adopt="true"/>
 						</TabPanel>
 					</TabPanels>
 				</Tabs>
diff --git a/app/components/DeleteProbes.vue b/app/components/gp-dialog/content/DeleteProbes.vue
similarity index 100%
rename from app/components/DeleteProbes.vue
rename to app/components/gp-dialog/content/DeleteProbes.vue
diff --git a/app/components/StartProbe.vue b/app/components/gp-dialog/content/StartProbe.vue
similarity index 87%
rename from app/components/StartProbe.vue
rename to app/components/gp-dialog/content/StartProbe.vue
index 4e0421c0..4a7ca3ab 100644
--- a/app/components/StartProbe.vue
+++ b/app/components/gp-dialog/content/StartProbe.vue
@@ -1,6 +1,6 @@
 <template>
 	<p>To join the Globalping probe network, all you have to do is run our container.</p>
-	<StartProbeCommands class="my-4" :adopt="props.adopt"/>
+	<ProbeStartCommands class="my-4" :adopt="props.adopt"/>
 	<p>Once the container starts, you become part of the global community that powers the Globalping Platform. The container works on both x86 and ARM architectures.</p>
 </template>
 
diff --git a/app/components/UpdateProbe.vue b/app/components/gp-dialog/content/UpdateProbe.vue
similarity index 75%
rename from app/components/UpdateProbe.vue
rename to app/components/gp-dialog/content/UpdateProbe.vue
index 1170f211..9a1fb713 100644
--- a/app/components/UpdateProbe.vue
+++ b/app/components/gp-dialog/content/UpdateProbe.vue
@@ -1,5 +1,5 @@
 <template>
 	<p>To update your probe, all you have to do is recreate the container.</p>
-	<StartProbeCommands class="my-4" :adopt="true" :recreate="true"/>
+	<ProbeStartCommands class="my-4" :adopt="true" :recreate="true"/>
 	<p>Once this is done, your probe will be updated and ready to handle new measurements.</p>
 </template>
diff --git a/app/components/list-items/AppItem.vue b/app/components/list-item/ListItemApps.vue
similarity index 100%
rename from app/components/list-items/AppItem.vue
rename to app/components/list-item/ListItemApps.vue
diff --git a/app/components/list-items/CreditItem.vue b/app/components/list-item/ListItemCredits.vue
similarity index 100%
rename from app/components/list-items/CreditItem.vue
rename to app/components/list-item/ListItemCredits.vue
diff --git a/app/components/list-items/TokenItem.vue b/app/components/list-item/ListItemTokens.vue
similarity index 100%
rename from app/components/list-items/TokenItem.vue
rename to app/components/list-item/ListItemTokens.vue
diff --git a/app/components/CityAutoComplete.vue b/app/components/probe/CityAutocomplete.vue
similarity index 100%
rename from app/components/CityAutoComplete.vue
rename to app/components/probe/CityAutocomplete.vue
diff --git a/app/components/probe/LocationInput.vue b/app/components/probe/LocationInput.vue
index 5ee96e2f..9117ba18 100644
--- a/app/components/probe/LocationInput.vue
+++ b/app/components/probe/LocationInput.vue
@@ -42,7 +42,7 @@
 		<div
 			class="relative flex h-full grow items-center rounded-md border border-[#D1D5DB] bg-white focus:z-10 focus:ring-1 focus:ring-primary sm:rounded-l-none sm:border-l-0 dark:border-dark-600 dark:bg-dark-800"
 		>
-			<CityAutoComplete
+			<ProbeCityAutocomplete
 				v-model="editedLocation"
 				v-model:input-ref="inputCityRef"
 				:dirty="isDirty"
diff --git a/app/components/ProbeAdoptedContent.vue b/app/components/probe/ProbeAdoptedContent.vue
similarity index 100%
rename from app/components/ProbeAdoptedContent.vue
rename to app/components/probe/ProbeAdoptedContent.vue
diff --git a/app/components/StartProbeCommands.vue b/app/components/probe/StartCommands.vue
similarity index 100%
rename from app/components/StartProbeCommands.vue
rename to app/components/probe/StartCommands.vue
diff --git a/app/components/probe/TabDetails.vue b/app/components/probe/TabDetails.vue
index aa8fea66..17371299 100644
--- a/app/components/probe/TabDetails.vue
+++ b/app/components/probe/TabDetails.vue
@@ -99,7 +99,7 @@
 			header="Delete probe"
 			aria-label="Remove a probe dialog"
 		>
-			<DeleteProbes :probes="[ probe ]" @cancel="deleteDialog = false" @success="onDeleteSuccess"/>
+			<GpDialogContentDeleteProbes :probes="[ probe ]" @cancel="deleteDialog = false" @success="onDeleteSuccess"/>
 		</GPDialog>
 	</div>
 </template>
diff --git a/app/components/probe/TabLogs.vue b/app/components/probe/TabLogs.vue
index fc01b419..a997f4d6 100644
--- a/app/components/probe/TabLogs.vue
+++ b/app/components/probe/TabLogs.vue
@@ -5,7 +5,7 @@
 				<span v-if="logs.length" class="font-bold">
 					Showing {{logs.length}} <span class="hidden sm:inline">most recent</span> {{pluralize('log', logs.length)}}.
 				</span>
-				<LogLoader v-else-if="enabled && !showLargeLoader"/>
+				<ProbeLogLoader v-else-if="enabled && !showLargeLoader"/>
 				<label
 					class="ml-auto flex cursor-pointer select-none items-center justify-end gap-2 whitespace-nowrap rounded-md border border-gray-500 px-2 py-1 duration-200 dark:border-gray-400"
 					:class="{
@@ -52,7 +52,7 @@
 					</span>
 				</span>
 				<div v-if="logs.length" class="h-fit px-1 py-2">
-					<LogLoader v-if="enabled"/>
+					<ProbeLogLoader v-if="enabled"/>
 					<span v-else class="block size-1.5"/>
 				</div>
 			</div>
@@ -63,7 +63,6 @@
 
 <script setup lang="ts">
 	import throttle from 'lodash/throttle';
-	import LogLoader from '~/components/probe/LogLoader.vue';
 	import { useErrorToast } from '~/composables/useErrorToast';
 	import { formatTechnicalDateTime } from '~/utils/date-formatters';
 	import { pluralize } from '~/utils/pluralize';
diff --git a/app/components/TagsList.vue b/app/components/probe/TagsList.vue
similarity index 100%
rename from app/components/TagsList.vue
rename to app/components/probe/TagsList.vue
diff --git a/app/components/probe/ProbeFilters/AdminFilterSettings.vue b/app/components/probe/filters/ProbeFiltersAdminOnly.vue
similarity index 100%
rename from app/components/probe/ProbeFilters/AdminFilterSettings.vue
rename to app/components/probe/filters/ProbeFiltersAdminOnly.vue
diff --git a/app/components/probe/ProbeFilters/ProbeListFilters.vue b/app/components/probe/filters/ProbeFiltersDesktop.vue
similarity index 97%
rename from app/components/probe/ProbeFilters/ProbeListFilters.vue
rename to app/components/probe/filters/ProbeFiltersDesktop.vue
index a49c5cbc..55dea109 100644
--- a/app/components/probe/ProbeFilters/ProbeListFilters.vue
+++ b/app/components/probe/filters/ProbeFiltersDesktop.vue
@@ -55,7 +55,7 @@
 			</Button>
 
 			<Popover ref="adminOptsRef" class="w-fit gap-4 p-4 [&>*]:border-none" role="dialog">
-				<AdminFilterSettings/>
+				<ProbeFiltersAdminOnly/>
 			</Popover>
 		</div>
 	</div>
@@ -64,7 +64,6 @@
 <script setup lang="ts">
 	import { aggregate } from '@directus/sdk';
 	import debounce from 'lodash/debounce';
-	import AdminFilterSettings from '~/components/probe/ProbeFilters/AdminFilterSettings.vue';
 	import { useErrorToast } from '~/composables/useErrorToast';
 	import { STATUS_MAP, type StatusCode, useProbeFilters } from '~/composables/useProbeFilters';
 	import { useAuth } from '~/store/auth';
diff --git a/app/components/probe/ProbeFilters/MobileProbeListFilters.vue b/app/components/probe/filters/ProbeFiltersMobile.vue
similarity index 96%
rename from app/components/probe/ProbeFilters/MobileProbeListFilters.vue
rename to app/components/probe/filters/ProbeFiltersMobile.vue
index 611b876b..319adea9 100644
--- a/app/components/probe/ProbeFilters/MobileProbeListFilters.vue
+++ b/app/components/probe/filters/ProbeFiltersMobile.vue
@@ -85,7 +85,7 @@
 			</div>
 		</div>
 
-		<AdminFilterSettings v-if="auth.adminMode" v-model:filter="draftFilter"/>
+		<ProbeFiltersAdminOnly v-if="auth.adminMode" v-model:filter="draftFilter"/>
 
 		<div class="mt-4 flex justify-end gap-2">
 			<Button label="Cancel" severity="secondary" text @click="emit('cancel')"/>
@@ -97,7 +97,6 @@
 <script setup lang="ts">
 	import { aggregate } from '@directus/sdk';
 	import debounce from 'lodash/debounce';
-	import AdminFilterSettings from '~/components/probe/ProbeFilters/AdminFilterSettings.vue';
 	import { useErrorToast } from '~/composables/useErrorToast';
 	import { type StatusCode, SORTABLE_FIELDS, STATUS_MAP, useProbeFilters } from '~/composables/useProbeFilters';
 	import { useAuth } from '~/store/auth';
diff --git a/app/components/TokenCalendar.vue b/app/components/token/TokenCalendar.vue
similarity index 100%
rename from app/components/TokenCalendar.vue
rename to app/components/token/TokenCalendar.vue
diff --git a/app/components/TokenDetails.vue b/app/components/token/TokenDetails.vue
similarity index 100%
rename from app/components/TokenDetails.vue
rename to app/components/token/TokenDetails.vue
diff --git a/app/components/TokenOptions.vue b/app/components/token/TokenOptions.vue
similarity index 100%
rename from app/components/TokenOptions.vue
rename to app/components/token/TokenOptions.vue
diff --git a/app/pages/credits.vue b/app/pages/credits.vue
index 27e1575f..e70b4ad5 100644
--- a/app/pages/credits.vue
+++ b/app/pages/credits.vue
@@ -86,7 +86,7 @@
 					No entries match the filter.
 				</p>
 				<AsyncRow v-for="(creditChange, index) in creditsChanges" v-else :key="index" :loading="loading">
-					<CreditItem :credit-change="creditChange"/>
+					<ListItemCredits :credit-change="creditChange"/>
 				</AsyncRow>
 			</div>
 			<Paginator
@@ -114,7 +114,7 @@
 			content-class="!p-0"
 			size="w-[700px]"
 		>
-			<AddCredits
+			<GpDialogContentAddCredits
 				@cancel="creditsDialog = false"
 				@adopt-a-probe="() => {
 					creditsDialog = false;
@@ -129,14 +129,13 @@
 			content-class="!p-0"
 			size="large"
 		>
-			<AdoptProbe @cancel="adoptProbeDialog = false" @adopted="refreshNuxtData"/>
+			<GpDialogContentAdoptProbe @cancel="adoptProbeDialog = false" @adopted="refreshNuxtData"/>
 		</GPDialog>
 	</div>
 </template>
 
 <script setup lang="ts">
 	import { aggregate, customEndpoint, readItems } from '@directus/sdk';
-	import CreditItem from '~/components/list-items/CreditItem.vue';
 	import { computedDebounced } from '~/composables/computedDebounced';
 	import { usePagination } from '~/composables/pagination';
 	import { useCreditsFilters } from '~/composables/useCreditsFilters';
diff --git a/app/pages/index.vue b/app/pages/index.vue
index f75179de..41b67e13 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -151,7 +151,7 @@
 			content-class="!p-0"
 			size="large"
 		>
-			<AdoptProbe @cancel="adoptProbeDialog = false" @adopted="refreshNuxtData"/>
+			<GpDialogContentAdoptProbe @cancel="adoptProbeDialog = false" @adopted="refreshNuxtData"/>
 		</GPDialog>
 
 		<GPDialog
@@ -161,7 +161,7 @@
 			content-class="!p-0"
 			size="w-[700px]"
 		>
-			<AddCredits
+			<GpDialogContentAddCredits
 				@cancel="creditsDialog = false"
 				@adopt-a-probe="() => {
 					creditsDialog = false;
diff --git a/app/pages/login.vue b/app/pages/login.vue
index d55c40d0..18a81ed2 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -42,7 +42,7 @@
 			content-class="!p-0"
 			size="w-[700px]"
 		>
-			<AddCredits @cancel="addCreditsDialog = false"/>
+			<GpDialogContentAddCredits @cancel="addCreditsDialog = false"/>
 		</GPDialog>
 	</section>
 </template>
diff --git a/app/pages/probes/[id].vue b/app/pages/probes/[id].vue
index 987431a1..30e17e56 100644
--- a/app/pages/probes/[id].vue
+++ b/app/pages/probes/[id].vue
@@ -119,7 +119,7 @@
 			header="Update a probe"
 			size="large"
 		>
-			<UpdateProbe/>
+			<GpDialogContentUpdateProbe/>
 		</GPDialog>
 	</div>
 </template>
diff --git a/app/pages/probes/index.vue b/app/pages/probes/index.vue
index 28719c36..91811b1f 100644
--- a/app/pages/probes/index.vue
+++ b/app/pages/probes/index.vue
@@ -41,7 +41,7 @@
 					<template #header>
 						<div class="flex w-full items-center">
 							<h3 class="px-2">List of probes</h3>
-							<ProbeListFilters/>
+							<ProbeFiltersDesktop/>
 						</div>
 					</template>
 
@@ -99,7 +99,7 @@
 						<template #body="slotProps">
 							<AsyncCell :loading="loading">
 								<NuxtLink :to="`/probes/${slotProps.data.id}`" class="flex h-full items-center">
-									<TagsList :tags="getAllTags(slotProps.data)" :wrapper="desktopTagsWrapperRef"/>
+									<ProbeTagsList :tags="getAllTags(slotProps.data)" :wrapper="desktopTagsWrapperRef"/>
 								</NuxtLink>
 							</AsyncCell>
 						</template>
@@ -141,7 +141,7 @@
 							ref="mobileFiltersRef"
 							class="!left-1/2 w-[95%] !-translate-x-1/2 !transform p-6 [&>*]:border-none"
 							role="dialog">
-							<MobileProbeListFilters
+							<ProbeFiltersMobile
 								@apply="() => mobileFiltersRef.toggle()"
 								@cancel="mobileFiltersRef.hide()"
 							/>
@@ -179,7 +179,7 @@
 												<span>{{ probe.version }}</span>
 											</div>
 											<div>
-												<TagsList :tags="getAllTags(probe)"/>
+												<ProbeTagsList :tags="getAllTags(probe)"/>
 											</div>
 										</div>
 									</NuxtLink>
@@ -244,7 +244,7 @@
 			header="Start a probe"
 			size="large"
 		>
-			<StartProbe/>
+			<GpDialogContentStartProbe/>
 		</GPDialog>
 		<GPDialog
 			v-model:visible="adoptProbeDialog"
@@ -252,20 +252,20 @@
 			content-class="!p-0"
 			size="large"
 		>
-			<AdoptProbe @cancel="adoptProbeDialog = false" @adopted="refresh"/>
+			<GpDialogContentAdoptProbe @cancel="adoptProbeDialog = false" @adopted="refresh"/>
 		</GPDialog>
 		<GPDialog
 			v-model:visible="deleteProbesDialog"
 			:header="`Delete ${pluralize('probe', selectedProbes.length)}`"
 		>
-			<DeleteProbes :probes="selectedProbes" @cancel="deleteProbesDialog = false" @success="onDeleteSuccess"/>
+			<GpDialogContentDeleteProbes :probes="selectedProbes" @cancel="deleteProbesDialog = false" @success="onDeleteSuccess"/>
 		</GPDialog>
 		<GPDialog
 			view-name="update-a-probe"
 			header="Update a probe"
 			size="large"
 		>
-			<UpdateProbe/>
+			<GpDialogContentUpdateProbe/>
 		</GPDialog>
 	</div>
 </template>
@@ -273,9 +273,6 @@
 <script setup lang="ts">
 	import { aggregate, readItems } from '@directus/sdk';
 	import CountryFlag from 'vue-country-flag-next';
-	import BigProbeIcon from '~/components/BigProbeIcon.vue';
-	import MobileProbeListFilters from '~/components/probe/ProbeFilters/MobileProbeListFilters.vue';
-	import ProbeListFilters from '~/components/probe/ProbeFilters/ProbeListFilters.vue';
 	import { computedDebounced } from '~/composables/computedDebounced';
 	import { useGoogleMaps } from '~/composables/maps';
 	import { usePagination } from '~/composables/pagination';
diff --git a/app/pages/tokens.vue b/app/pages/tokens.vue
index f98dba63..dbf00443 100644
--- a/app/pages/tokens.vue
+++ b/app/pages/tokens.vue
@@ -97,7 +97,7 @@
 							<CodeBlock data-testid="token-value" :commands="[[generatedToken!.value]]"/>
 						</div>
 						<AsyncRow v-for="token in tokens" :key="token.id" :loading="loadingTokens">
-							<TokenItem
+							<ListItemTokens
 								:token="token"
 								@edit="openTokenDetails('edit', token.id)"
 								@regenerate="openRegenerateDialog(token.id)"
@@ -166,7 +166,7 @@
 						<i class="pi pi-spin pi-spinner text-xl"/>
 					</div>
 					<AsyncRow v-for="app in apps" v-else :key="app.id" :loading="loadingApplications">
-						<AppItem
+						<ListItemApps
 							:app="app"
 							@revoke="openRevokeDialog(app.id)"
 						/>
@@ -262,9 +262,6 @@
 
 <script setup lang="ts">
 	import { aggregate, customEndpoint, deleteItem, readItems, updateItem } from '@directus/sdk';
-	import AsyncRow from '~/components/AsyncRow.vue';
-	import AppItem from '~/components/list-items/AppItem.vue';
-	import TokenItem from '~/components/list-items/TokenItem.vue';
 	import { usePagination } from '~/composables/pagination';
 	import { useErrorToast } from '~/composables/useErrorToast';
 	import { useUserFilter } from '~/composables/useUserFilter';
diff --git a/app/plugins/05.setMetadata.ts b/app/plugins/05.setMetadata.ts
index e599257b..38f4175e 100644
--- a/app/plugins/05.setMetadata.ts
+++ b/app/plugins/05.setMetadata.ts
@@ -1,5 +1,5 @@
 import { customEndpoint } from '@directus/sdk';
-import { useMetadata } from '~/store/metadata.js';
+import { useMetadata } from '~/store/metadata';
 
 export default defineNuxtPlugin(async () => {
 	const metadata = useMetadata();
diff --git a/app/utils/init-google-map.ts b/app/utils/init-google-map.ts
index 9d21261e..3e300d48 100644
--- a/app/utils/init-google-map.ts
+++ b/app/utils/init-google-map.ts
@@ -1,4 +1,4 @@
-import { useAppearance } from '~/store/appearance.js';
+import { useAppearance } from '~/store/appearance';
 
 const MAP_MIN_ZOOM = 1;
 const MAP_MAX_ZOOM = 22;
diff --git a/eslint.config.js b/eslint.config.js
index d60d3375..a1429b14 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -49,6 +49,14 @@ export default createConfigForNuxt().prepend(
 			],
 		},
 	},
+	{
+		files: [
+			'{app,server}/**/*.{ts,vue}',
+		],
+		rules: {
+			'import/extensions': [ 'error', 'never' ],
+		},
+	},
 	{
 		files: [
 			'**/*.vue',