diff --git a/app/lookup/[domain]/_components/copy-button.tsx b/app/_components/copy-button.tsx
similarity index 100%
rename from app/lookup/[domain]/_components/copy-button.tsx
rename to app/_components/copy-button.tsx
diff --git a/app/lookup/[domain]/_components/domain-link.tsx b/app/_components/domain-link.tsx
similarity index 100%
rename from app/lookup/[domain]/_components/domain-link.tsx
rename to app/_components/domain-link.tsx
diff --git a/app/lookup/[domain]/_components/ip-details-modal.tsx b/app/_components/ip-details-modal.tsx
similarity index 100%
rename from app/lookup/[domain]/_components/ip-details-modal.tsx
rename to app/_components/ip-details-modal.tsx
diff --git a/app/lookup/[domain]/_components/location-map.tsx b/app/_components/location-map.tsx
similarity index 100%
rename from app/lookup/[domain]/_components/location-map.tsx
rename to app/_components/location-map.tsx
diff --git a/app/_components/search-form.tsx b/app/_components/search-form.tsx
index 13bf7c4..9d6eb77 100644
--- a/app/_components/search-form.tsx
+++ b/app/_components/search-form.tsx
@@ -31,7 +31,7 @@ import {
   isValidDomain,
 } from '@/lib/utils';
 
-import { IpDetailsModal } from '../lookup/[domain]/_components/ip-details-modal';
+import { IpDetailsModal } from './ip-details-modal';
 
 const normalizeDomain = (input: string) => {
   let tDomain;
diff --git a/app/lookup/[domain]/(dns)/_components/record-row.tsx b/app/lookup/[domain]/(dns)/_components/record-row.tsx
index e309bd4..8316e83 100644
--- a/app/lookup/[domain]/(dns)/_components/record-row.tsx
+++ b/app/lookup/[domain]/(dns)/_components/record-row.tsx
@@ -7,7 +7,7 @@ import { TableCell, TableRow } from '@/components/ui/table';
 import type { RecordContextEntry } from '@/lib/record-context';
 import { cn, DOMAIN_REGEX, IPV4_REGEX, IPV6_REGEX } from '@/lib/utils';
 
-import { DomainLink } from '../../_components/domain-link';
+import { DomainLink } from '../../../../_components/domain-link';
 import { IpLink } from '../../_components/ip-link';
 import { RecordSubvalues } from './record-subvalues';
 
diff --git a/app/lookup/[domain]/(dns)/_components/stacked-record.tsx b/app/lookup/[domain]/(dns)/_components/stacked-record.tsx
index 45464dd..fd36555 100644
--- a/app/lookup/[domain]/(dns)/_components/stacked-record.tsx
+++ b/app/lookup/[domain]/(dns)/_components/stacked-record.tsx
@@ -3,7 +3,7 @@ import reactStringReplace from 'react-string-replace';
 
 import type { RecordContextEntry } from '@/lib/record-context';
 
-import { DomainLink } from '../../_components/domain-link';
+import { DomainLink } from '../../../../_components/domain-link';
 import { IpLink } from '../../_components/ip-link';
 import { RecordSubvalues } from './record-subvalues';
 
diff --git a/app/lookup/[domain]/_components/ip-link.tsx b/app/lookup/[domain]/_components/ip-link.tsx
index 97e717f..2077e3b 100644
--- a/app/lookup/[domain]/_components/ip-link.tsx
+++ b/app/lookup/[domain]/_components/ip-link.tsx
@@ -12,7 +12,7 @@ import {
 
 import { useAnalytics } from '@/lib/analytics';
 
-import { IpDetailsModal } from './ip-details-modal';
+import { IpDetailsModal } from '../../../_components/ip-details-modal';
 
 type IpLinkProps = {
   value: string;
diff --git a/app/lookup/[domain]/certs/_components/table.tsx b/app/lookup/[domain]/certs/_components/table.tsx
index 9fa560a..b1619f5 100644
--- a/app/lookup/[domain]/certs/_components/table.tsx
+++ b/app/lookup/[domain]/certs/_components/table.tsx
@@ -6,7 +6,7 @@ import { SortableTable } from '@/components/sortable-table';
 import type { CertsData } from '@/lib/certs';
 import { isValidDomain } from '@/lib/utils';
 
-import { DomainLink } from '../../_components/domain-link';
+import { DomainLink } from '../../../../_components/domain-link';
 
 type CertsTableProps = {
   certs: CertsData;
diff --git a/app/lookup/[domain]/layout.tsx b/app/lookup/[domain]/layout.tsx
index 43c3618..a2cb7a0 100644
--- a/app/lookup/[domain]/layout.tsx
+++ b/app/lookup/[domain]/layout.tsx
@@ -7,12 +7,12 @@ import { type FC, type ReactNode } from 'react';
 
 import { Card } from '@/components/ui/card';
 
-import { Footer } from '@/app/_components/footer';
-import { Header } from '@/app/_components/header';
 import { getVisitorIp, isUserBot } from '@/lib/api';
 import { recordLookup } from '@/lib/search';
 import { isValidDomain, isWildcardDomain } from '@/lib/utils';
 
+import { Footer } from '../../_components/footer';
+import { Header } from '../../_components/header';
 import { RelatedDomains } from './_components/related-domains';
 import { ResultsTabs } from './_components/results-tabs';
 import { ShareButton } from './_components/share-button';
diff --git a/app/lookup/[domain]/subdomains/_components/table.tsx b/app/lookup/[domain]/subdomains/_components/table.tsx
index 3154cf8..660fd70 100644
--- a/app/lookup/[domain]/subdomains/_components/table.tsx
+++ b/app/lookup/[domain]/subdomains/_components/table.tsx
@@ -12,7 +12,7 @@ import {
 
 import { SortableTable } from '@/components/sortable-table';
 
-import { DomainLink } from '../../_components/domain-link';
+import { DomainLink } from '../../../../_components/domain-link';
 
 type SubdomainsTableProps = {
   results: {