diff --git a/web/app/components/devtools/index.ts b/web/app/components/devtools/index.ts
new file mode 100644
index 0000000000..54c8aa8111
--- /dev/null
+++ b/web/app/components/devtools/index.ts
@@ -0,0 +1,2 @@
+export { ReactScan } from './react-scan'
+export { TanStackDevtoolsWrapper } from './tanstack-devtools'
diff --git a/web/app/components/react-scan.tsx b/web/app/components/devtools/react-scan.tsx
similarity index 100%
rename from web/app/components/react-scan.tsx
rename to web/app/components/devtools/react-scan.tsx
diff --git a/web/app/components/devtools.tsx b/web/app/components/devtools/tanstack-devtools.tsx
similarity index 100%
rename from web/app/components/devtools.tsx
rename to web/app/components/devtools/tanstack-devtools.tsx
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index c182f12dc9..f04b2fe39a 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -8,8 +8,8 @@ import { getLocaleOnServer } from '@/i18n-config/server'
 import { DatasetAttr } from '@/types/feature'
 import { cn } from '@/utils/classnames'
 import BrowserInitializer from './components/browser-initializer'
+import { ReactScan } from './components/devtools'
 import I18nServer from './components/i18n-server'
-import { ReactScan } from './components/react-scan'
 import SentryInitializer from './components/sentry-initializer'
 import RoutePrefixHandle from './routePrefixHandle'
 import './styles/globals.css'