Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

refactor(frontend): move members logic to models and drop preflight shim (#126310)

Paul D'Ambra92bd26fe5aaa
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
index 5b7310a8225a..852ad5d7fc15 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/ResourceAccessControlsV2/accessControlsLogic.ts
@@ -21,10 +21,10 @@ import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { captureAccessControlEvent, pluralizeResource } from 'lib/utils/accessControlUtils'
import { toSentenceCase } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
+import { membersLogic } from '~/models/membersLogic'
import {
APIScopeObject,
AccessControlDefaultsResponse,
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
index d9bf38e656f8..bf4277f93105 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/accessControlLogic.ts
@@ -10,9 +10,9 @@ import {
pluralizeResource,
resourceToApiRoute,
} from 'lib/utils/accessControlUtils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { teamLogic } from 'scenes/teamLogic'
+import { membersLogic } from '~/models/membersLogic'
import {
APIScopeObject,
AccessControlLevel,
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
index 5e2007a573ea..6340d927db51 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/roleAccessControlLogic.ts
@@ -7,12 +7,12 @@ import { actionToUrl, router, urlToAction } from 'kea-router'
import { lemonToast } from '@posthog/lemon-ui'
import api from 'lib/api'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { AccessControlResponseType, RoleType } from '~/types'
import type { AvailableFeature, OrganizationMemberType } from '../../../../../types'
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/quill/QuillActivityMemberFilter.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/quill/QuillActivityMemberFilter.tsx
index fc4a8e99c89c..15c6d0b41aed 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/activity/quill/QuillActivityMemberFilter.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/activity/quill/QuillActivityMemberFilter.tsx
@@ -15,8 +15,8 @@ import {
import { QuillPersonAvatar } from 'lib/components/QuillPersonAvatar/QuillPersonAvatar'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { UserBasicType } from '~/types'
const ANY_USER = 'any'
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/support/SidePanelSupport.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/support/SidePanelSupport.tsx
index 97054552242a..88ef3c205ca8 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/support/SidePanelSupport.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/support/SidePanelSupport.tsx
@@ -9,8 +9,8 @@ import { DEFAULT_PAID_RESPONSE_TIME, getSupportPlanRows } from 'lib/components/S
import { FEATURE_FLAGS } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { billingLogic } from 'scenes/billing/billingLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
index d8ed2a2264dd..8c90e0dd7e79 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/sidePanelLogic.tsx
@@ -3,7 +3,7 @@ import { combineUrl, router, urlToAction } from 'kea-router'
import { FEATURE_FLAGS } from 'lib/constants'
import { FeatureFlagsSet, featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
index bd9e9d3b6aaf..438c0d5ccddf 100644
--- a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
+++ b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.tsx
@@ -1,11 +1,11 @@
import { MakeLogicType, actions, afterMount, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
import { subscriptions } from 'kea-subscriptions'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { objectsEqual } from 'lib/utils/objects'
import { identifierToHuman } from 'lib/utils/strings'
import { stripHTTP } from 'lib/utils/url'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { projectLogic } from 'scenes/projectLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.test.ts b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.test.ts
index 6d8ac24712bb..70cb367e0be3 100644
--- a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.test.ts
+++ b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.test.ts
@@ -10,11 +10,11 @@ import { expectLogic } from 'kea-test-utils'
import { lemonToast } from '@posthog/lemon-ui'
import { OrganizationMembershipLevel } from 'lib/constants'
-import { membersLogic } from 'scenes/organization/membersLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { useMocks } from '~/mocks/jest'
+import { membersLogic } from '~/models/membersLogic'
import { initKeaTests } from '~/test/init'
import { OrganizationMemberType, Region, UserType } from '~/types'
diff --git a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
index 57dc5eda5964..0974bb148cc9 100644
--- a/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
+++ b/frontend/src/layout/navigation/ImpersonationNotice/impersonationNoticeLogic.ts
@@ -7,9 +7,9 @@ import api from 'lib/api'
import { CLOUD_HOSTNAMES } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { OrganizationMemberType, Region, UserType } from '~/types'
import { adminLoginAs } from './adminLoginAs'
diff --git a/frontend/src/layout/navigation/projectNoticeLogic.test.tsx b/frontend/src/layout/navigation/projectNoticeLogic.test.tsx
index c2b511642d80..70375b38dd68 100644
--- a/frontend/src/layout/navigation/projectNoticeLogic.test.tsx
+++ b/frontend/src/layout/navigation/projectNoticeLogic.test.tsx
@@ -12,10 +12,10 @@ import { FEATURE_FLAGS } from 'lib/constants'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { apiStatusLogic } from 'lib/logic/apiStatusLogic'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { verifyEmailLogic } from 'scenes/authentication/verify-email/verifyEmailLogic'
import { billingLogic } from 'scenes/billing/billingLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/layout/navigation/projectNoticeLogic.tsx b/frontend/src/layout/navigation/projectNoticeLogic.tsx
index 502f2cd05a06..9828d8f84d6b 100644
--- a/frontend/src/layout/navigation/projectNoticeLogic.tsx
+++ b/frontend/src/layout/navigation/projectNoticeLogic.tsx
@@ -15,14 +15,13 @@ import { Link } from 'lib/lemon-ui/Link'
import { apiStatusLogic } from 'lib/logic/apiStatusLogic'
import { eventIngestionRestrictionLogic } from 'lib/logic/eventIngestionRestrictionLogic'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { liveEventsLogic } from 'scenes/activity/live/liveEventsLogic'
import { verifyEmailLogic } from 'scenes/authentication/verify-email/verifyEmailLogic'
import { billingLogic, BillingAlertConfig } from 'scenes/billing/billingLogic'
import { sampleDataStateLogic } from 'scenes/insights/EmptyStates/sampleDataStateLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { Scene } from 'scenes/sceneTypes'
import { ProxyRecord } from 'scenes/settings/environment/proxyLogic'
@@ -32,6 +31,7 @@ import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
import { brandingForProduct } from 'scenes/welcome/productBranding'
+import { membersLogic } from '~/models/membersLogic'
import { ProductKey } from '~/queries/schema/schema-general'
import { OnboardingStepKey, TeamPublicType, TeamType, UserType } from '~/types'
diff --git a/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.test.ts b/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.test.ts
index 19f9da2cfd16..a5434bc06956 100644
--- a/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.test.ts
+++ b/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.test.ts
@@ -6,8 +6,8 @@ import { expectLogic } from 'kea-test-utils'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.ts b/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.ts
index c06f9db6dcdb..71fa2d332a1a 100644
--- a/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.ts
+++ b/frontend/src/layout/panel-layout/navbar/tabs/navProductsTabLogic.ts
@@ -8,10 +8,10 @@ import { lemonToast } from '@posthog/lemon-ui'
import { FEATURE_FLAGS } from 'lib/constants'
import { FeatureFlagsSet, featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { getProductAccessDisabledReason } from 'lib/utils/accessControlUtils'
import { withTimeout } from 'lib/utils/async'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { aiConsentLogic } from 'scenes/settings/organization/aiConsentLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/layout/today/TodaySessionHandoffDialog.tsx b/frontend/src/layout/today/TodaySessionHandoffDialog.tsx
index c4a1d80ff114..ab7f74cd5d28 100644
--- a/frontend/src/layout/today/TodaySessionHandoffDialog.tsx
+++ b/frontend/src/layout/today/TodaySessionHandoffDialog.tsx
@@ -24,9 +24,10 @@ import {
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
+
import { todaySessionMenuLogic } from './todaySessionMenuLogic'
interface TodaySessionHandoffDialogProps {
diff --git a/frontend/src/layout/today/TodaySupportPanel.tsx b/frontend/src/layout/today/TodaySupportPanel.tsx
index c3f6efd6dab9..333b9721db6d 100644
--- a/frontend/src/layout/today/TodaySupportPanel.tsx
+++ b/frontend/src/layout/today/TodaySupportPanel.tsx
@@ -6,8 +6,8 @@ import { Button, Heading, Skeleton, Text, cn } from '@posthog/quill'
import { FEATURE_FLAGS } from 'lib/constants'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { billingLogic } from 'scenes/billing/billingLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { ProductKey } from '~/queries/schema/schema-general'
diff --git a/frontend/src/lib/components/CommandKSearch/commandKSearchLogic.tsx b/frontend/src/lib/components/CommandKSearch/commandKSearchLogic.tsx
index 648813f633cf..0022679cf5b5 100644
--- a/frontend/src/lib/components/CommandKSearch/commandKSearchLogic.tsx
+++ b/frontend/src/lib/components/CommandKSearch/commandKSearchLogic.tsx
@@ -24,12 +24,12 @@ import posthog from 'lib/posthog-typed'
import { navigateToHref } from 'lib/utils/navigateToHref'
import { newInternalTab } from 'lib/utils/newInternalTab'
import { MAX_SIDE_PANEL_ID } from 'scenes/max/components/PhaiSidePanelChat'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { teamLogic } from 'scenes/teamLogic'
import { userLogic } from 'scenes/userLogic'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
import { groupsModel } from '~/models/groupsModel'
+import { membersLogic } from '~/models/membersLogic'
import { recentItemsModel } from '~/models/recentItemsModel'
import { FileSystemEntry } from '~/queries/schema/schema-general'
import { SidePanelTab } from '~/types'
diff --git a/frontend/src/lib/components/Comments/commentsLogic.ts b/frontend/src/lib/components/Comments/commentsLogic.ts
index a836a56b9d98..fdb8c905837d 100644
--- a/frontend/src/lib/components/Comments/commentsLogic.ts
+++ b/frontend/src/lib/components/Comments/commentsLogic.ts
@@ -10,11 +10,11 @@ import { JSONContent, RichContentEditorType } from 'lib/components/RichContentEd
import { slackChannelId } from 'lib/integrations/slackChannel'
import { deleteWithUndo } from 'lib/utils/deleteWithUndo'
import { isEmptyObject } from 'lib/utils/guards'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { teamLogic } from 'scenes/teamLogic'
import { userLogic } from 'scenes/userLogic'
import { sidePanelDiscussionLogic } from '~/layout/navigation-3000/sidepanel/panels/discussion/sidePanelDiscussionLogic'
+import { membersLogic } from '~/models/membersLogic'
import { CommentType } from '~/types'
import type { OrganizationMemberType, UserType } from '~/types'
diff --git a/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts b/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
index bdd06d2bce83..77068ac233f6 100644
--- a/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
+++ b/frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts
@@ -15,9 +15,9 @@ import { subscriptions } from 'kea-subscriptions'
import posthog from 'posthog-js'
import api from 'lib/api'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { toolbarConfigLogic } from '~/toolbar/shared/toolbarConfigLogic'
import { toolbarFetch } from '~/toolbar/shared/toolbarFetch'
import { HedgehogConfig, MinimalHedgehogConfig } from '~/types'
diff --git a/frontend/src/lib/components/MemberMultiSelect.tsx b/frontend/src/lib/components/MemberMultiSelect.tsx
index 5c738534c25a..c13521c9ee76 100644
--- a/frontend/src/lib/components/MemberMultiSelect.tsx
+++ b/frontend/src/lib/components/MemberMultiSelect.tsx
@@ -4,8 +4,8 @@ import { useEffect, useMemo, useState } from 'react'
import { LemonButton, LemonButtonProps, LemonDropdown, LemonDropdownProps } from '@posthog/lemon-ui'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { UserBasicType } from '~/types'
import { MemberSelectMultipleOptions } from './MemberSelectMultipleOptions'
diff --git a/frontend/src/lib/components/MemberSelect.tsx b/frontend/src/lib/components/MemberSelect.tsx
index d58fa2b73d09..8b942c8c4016 100644
--- a/frontend/src/lib/components/MemberSelect.tsx
+++ b/frontend/src/lib/components/MemberSelect.tsx
@@ -4,8 +4,8 @@ import { useEffect, useMemo, useState } from 'react'
import { LemonButton, LemonButtonProps, LemonDropdown, LemonDropdownProps, LemonInput } from '@posthog/lemon-ui'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { UserBasicType } from '~/types'
import { MemberSelectOptions } from './MemberSelectOptions'
diff --git a/frontend/src/lib/components/MemberSelectMultiple.tsx b/frontend/src/lib/components/MemberSelectMultiple.tsx
index 0452c814ed85..1fe934f1a14d 100644
--- a/frontend/src/lib/components/MemberSelectMultiple.tsx
+++ b/frontend/src/lib/components/MemberSelectMultiple.tsx
@@ -4,8 +4,8 @@ import { LemonInputSelect } from '@posthog/lemon-ui'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { fullNameOrEmail } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { UserBasicType } from '~/types'
type UserIdType = string | number
diff --git a/frontend/src/lib/components/MemberSelectMultipleOptions.tsx b/frontend/src/lib/components/MemberSelectMultipleOptions.tsx
index 67045a075e21..7c010f18dc9e 100644
--- a/frontend/src/lib/components/MemberSelectMultipleOptions.tsx
+++ b/frontend/src/lib/components/MemberSelectMultipleOptions.tsx
@@ -4,7 +4,7 @@ import { useMemo, useRef, useState } from 'react'
import { IconX } from '@posthog/icons'
import { LemonButton, LemonInput } from '@posthog/lemon-ui'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { MemberSelectRow } from './MemberSelectRow'
diff --git a/frontend/src/lib/components/MemberSelectMultiplePopover.tsx b/frontend/src/lib/components/MemberSelectMultiplePopover.tsx
index 026ee57e24a5..b20fadaed1d1 100644
--- a/frontend/src/lib/components/MemberSelectMultiplePopover.tsx
+++ b/frontend/src/lib/components/MemberSelectMultiplePopover.tsx
@@ -3,7 +3,8 @@ import { useActions, useValues } from 'kea'
import { LemonDropdown } from '@posthog/lemon-ui'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { membersLogic } from 'scenes/organization/membersLogic'
+
+import { membersLogic } from '~/models/membersLogic'
import { MemberSelectMultipleOptions } from './MemberSelectMultipleOptions'
import { useMemberFilterClearAction } from './useMemberFilterClearAction'
diff --git a/frontend/src/lib/components/Metalytics/metalyticsLogic.ts b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
index dd05b3f881f1..a8023b57b296 100644
--- a/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
+++ b/frontend/src/lib/components/Metalytics/metalyticsLogic.ts
@@ -3,7 +3,6 @@ import { loaders } from 'kea-loaders'
import { subscriptions } from 'kea-subscriptions'
import api from 'lib/api'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { teamLogic } from 'scenes/teamLogic'
@@ -11,6 +10,7 @@ import { sidePanelContextLogic } from '~/layout/navigation-3000/sidepanel/sidePa
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
import { SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
+import { membersLogic } from '~/models/membersLogic'
import { hogql } from '~/queries/utils'
import { ActivityScope, SidePanelTab } from '~/types'
diff --git a/frontend/src/lib/components/PayGateMini/payGateMiniLogic.test.ts b/frontend/src/lib/components/PayGateMini/payGateMiniLogic.test.ts
index 38e5774ea0f8..bbe6e34fece7 100644
--- a/frontend/src/lib/components/PayGateMini/payGateMiniLogic.test.ts
+++ b/frontend/src/lib/components/PayGateMini/payGateMiniLogic.test.ts
@@ -1,8 +1,8 @@
/* oxlint-disable react-hooks/rules-of-hooks -- useMocks is a test helper, not a React hook */
import { expectLogic } from 'kea-test-utils'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { billingLogic } from 'scenes/billing/billingLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { billingJson } from '~/mocks/fixtures/_billing'
import preflightJson from '~/mocks/fixtures/_preflight.json'
diff --git a/frontend/src/lib/components/ProductEmptyState/ProductEmptyState.test.tsx b/frontend/src/lib/components/ProductEmptyState/ProductEmptyState.test.tsx
index e28f0cedf51b..24c0f6376858 100644
--- a/frontend/src/lib/components/ProductEmptyState/ProductEmptyState.test.tsx
+++ b/frontend/src/lib/components/ProductEmptyState/ProductEmptyState.test.tsx
@@ -4,7 +4,7 @@ import { expectLogic } from 'kea-test-utils'
import { pngHoggie } from 'lib/brand/hoggies'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { useMocks } from '~/mocks/jest'
import { ProductKey } from '~/queries/schema/schema-general'
diff --git a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.tsx b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.tsx
index 4e25167204f3..2204b932aec4 100644
--- a/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.tsx
+++ b/frontend/src/lib/components/PropertyFilters/components/PropertyFilterButton.tsx
@@ -9,9 +9,9 @@ import { LemonButton, PopoverReferenceContext, Tooltip } from '@posthog/lemon-ui
import { PropertyFilterIcon } from 'lib/components/PropertyFilters/components/PropertyFilterIcon'
import { fullNameOrEmail, midEllipsis } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { cohortsModel } from '~/models/cohortsModel'
+import { membersLogic } from '~/models/membersLogic'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
import { AnyPropertyFilter, GroupPropertyFilter, GroupTypeIndex } from '~/types'
diff --git a/frontend/src/lib/components/RichContentEditor/MentionsExtension.test.tsx b/frontend/src/lib/components/RichContentEditor/MentionsExtension.test.tsx
index d3e92c5e1aa5..5c2e2347bae7 100644
--- a/frontend/src/lib/components/RichContentEditor/MentionsExtension.test.tsx
+++ b/frontend/src/lib/components/RichContentEditor/MentionsExtension.test.tsx
@@ -8,9 +8,8 @@ import { Provider } from 'kea'
import { expectLogic } from 'kea-test-utils'
import { createRef } from 'react'
-import { membersLogic } from 'scenes/organization/membersLogic'
-
import { useMocks } from '~/mocks/jest'
+import { membersLogic } from '~/models/membersLogic'
import { initKeaTests } from '~/test/init'
import { Mentions } from './MentionsExtension'
diff --git a/frontend/src/lib/components/RichContentEditor/MentionsExtension.tsx b/frontend/src/lib/components/RichContentEditor/MentionsExtension.tsx
index 4d739109f1c0..90ea43f07dea 100644
--- a/frontend/src/lib/components/RichContentEditor/MentionsExtension.tsx
+++ b/frontend/src/lib/components/RichContentEditor/MentionsExtension.tsx
@@ -9,8 +9,8 @@ import { LemonButton, ProfilePicture } from '@posthog/lemon-ui'
import { Popover } from 'lib/lemon-ui/Popover'
import { createFuse } from 'lib/utils/fuseSearch'
import { isKeyOf } from 'lib/utils/guards'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { OrganizationMemberType } from '~/types'
import { EditorRange, RichContentNodeType } from './types'
diff --git a/frontend/src/lib/components/RichContentEditor/RichContentNodeMention.tsx b/frontend/src/lib/components/RichContentEditor/RichContentNodeMention.tsx
index 8f91e1ad1568..e24418818d82 100644
--- a/frontend/src/lib/components/RichContentEditor/RichContentNodeMention.tsx
+++ b/frontend/src/lib/components/RichContentEditor/RichContentNodeMention.tsx
@@ -5,7 +5,7 @@ import { useValues } from 'kea'
import { ProfilePicture, Tooltip } from '@posthog/lemon-ui'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { RichContentNodeType } from './types'
diff --git a/frontend/src/scenes/organization/membersLogic.test.ts b/frontend/src/models/membersLogic.test.ts
similarity index 100%
rename from frontend/src/scenes/organization/membersLogic.test.ts
rename to frontend/src/models/membersLogic.test.ts
diff --git a/frontend/src/scenes/organization/membersLogic.tsx b/frontend/src/models/membersLogic.tsx
similarity index 100%
rename from frontend/src/scenes/organization/membersLogic.tsx
rename to frontend/src/models/membersLogic.tsx
diff --git a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
index dc381f63b1fb..bd958afd11de 100644
--- a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
+++ b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
@@ -27,10 +27,10 @@ import { LemonDialog, LemonInput } from '@posthog/lemon-ui'
import api from 'lib/api'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { dataWarehouseViewsLogic } from 'scenes/data-warehouse/saved_queries/dataWarehouseViewsLogic'
import { validateSavedQueryName } from 'scenes/data-warehouse/saved_queries/savedQueryNameValidation'
import { dataWarehouseSettingsSceneLogic } from 'scenes/data-warehouse/settings/dataWarehouseSettingsSceneLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { DataNode, HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
diff --git a/frontend/src/queries/nodes/InsightViz/ComputationTimeWithRefresh.tsx b/frontend/src/queries/nodes/InsightViz/ComputationTimeWithRefresh.tsx
index 6e824a670800..d7b42e1f080c 100644
--- a/frontend/src/queries/nodes/InsightViz/ComputationTimeWithRefresh.tsx
+++ b/frontend/src/queries/nodes/InsightViz/ComputationTimeWithRefresh.tsx
@@ -5,9 +5,9 @@ import { Link, Tooltip } from '@posthog/lemon-ui'
import { dayjs } from 'lib/dayjs'
import { usePeriodicRerender } from 'lib/hooks/usePeriodicRerender'
import { Spinner } from 'lib/lemon-ui/Spinner'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { insightDataLogic } from 'scenes/insights/insightDataLogic'
import { insightLogic } from 'scenes/insights/insightLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { shouldQueryBeAsync } from '~/queries/utils'
diff --git a/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx b/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
index 543361cef141..35e6388d0023 100644
--- a/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
+++ b/frontend/src/scenes/PreflightCheck/PreflightCheck.tsx
@@ -11,13 +11,12 @@ import { IconErrorOutline } from 'lib/lemon-ui/icons'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
import { LemonRow } from 'lib/lemon-ui/LemonRow'
+import { PreflightCheckStatus, PreflightItem, preflightLogic } from 'lib/logic/preflightLogic'
import { capitalizeFirstLetter } from 'lib/utils/strings'
import { AUTH_NOTES } from 'scenes/authentication/shared/authScene/authNotes'
import { AuthScene, AuthSceneCard } from 'scenes/authentication/shared/authScene/AuthScene'
import { SceneExport } from 'scenes/sceneTypes'
-import { PreflightCheckStatus, PreflightItem, preflightLogic } from './preflightLogic'
-
export const scene: SceneExport = {
component: PreflightCheck,
logic: preflightLogic,
diff --git a/frontend/src/scenes/PreflightCheck/preflightLogic.tsx b/frontend/src/scenes/PreflightCheck/preflightLogic.tsx
deleted file mode 100644
index 8228705f5340..000000000000
--- a/frontend/src/scenes/PreflightCheck/preflightLogic.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from 'lib/logic/preflightLogic'
diff --git a/frontend/src/scenes/analytics/AnalyticsListFilters.tsx b/frontend/src/scenes/analytics/AnalyticsListFilters.tsx
index e89d15637ad2..29375b589cac 100644
--- a/frontend/src/scenes/analytics/AnalyticsListFilters.tsx
+++ b/frontend/src/scenes/analytics/AnalyticsListFilters.tsx
@@ -4,9 +4,9 @@ import { IconTrends } from '@posthog/icons'
import { Button, ToggleGroup, ToggleGroupItem } from '@posthog/quill'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { tagsModel } from '~/models/tagsModel'
import { AnalyticsDisplayMenu } from './AnalyticsDisplayMenu'
diff --git a/frontend/src/scenes/appLogic.tsx b/frontend/src/scenes/appLogic.tsx
index 9ee3cfb6dc69..927cc9570353 100644
--- a/frontend/src/scenes/appLogic.tsx
+++ b/frontend/src/scenes/appLogic.tsx
@@ -2,8 +2,8 @@ import { MakeLogicType, actions, connect, events, kea, path, reducers, selectors
import { router, urlToAction } from 'kea-router'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/approvals/ApprovalDetail.tsx b/frontend/src/scenes/approvals/ApprovalDetail.tsx
index d7b21dcc21a3..63f102cc5394 100644
--- a/frontend/src/scenes/approvals/ApprovalDetail.tsx
+++ b/frontend/src/scenes/approvals/ApprovalDetail.tsx
@@ -14,13 +14,13 @@ import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
import { Link } from 'lib/lemon-ui/Link'
import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
import { getApprovalActionLabel, getApprovalResourceName, getApprovalResourceUrl } from 'scenes/approvals/utils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
import { SceneContent } from '~/layout/scenes/components/SceneContent'
import { SceneDivider } from '~/layout/scenes/components/SceneDivider'
import { SceneTitleSection } from '~/layout/scenes/components/SceneTitleSection'
+import { membersLogic } from '~/models/membersLogic'
import { ApprovalDecision, ChangeRequest, ChangeRequestState } from '~/types'
import { ApprovalLogicProps, ProposedChangesTab, approvalLogic } from './approvalLogic'
diff --git a/frontend/src/scenes/approvals/approvalLogic.tsx b/frontend/src/scenes/approvals/approvalLogic.tsx
index a3f894e0db3f..299e978e413c 100644
--- a/frontend/src/scenes/approvals/approvalLogic.tsx
+++ b/frontend/src/scenes/approvals/approvalLogic.tsx
@@ -6,13 +6,13 @@ import { lemonToast } from '@posthog/lemon-ui'
import api from 'lib/api'
import { getApprovalActionLabel, getApprovalResourceUrl } from 'scenes/approvals/utils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { Scene } from 'scenes/sceneTypes'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { AvailableFeature, Breadcrumb, ChangeRequest, ChangeRequestState } from '~/types'
export interface ApprovalLogicProps {
diff --git a/frontend/src/scenes/authentication/auth/Auth.tsx b/frontend/src/scenes/authentication/auth/Auth.tsx
index c0cfe9ab8b92..3ec72fdf803c 100644
--- a/frontend/src/scenes/authentication/auth/Auth.tsx
+++ b/frontend/src/scenes/authentication/auth/Auth.tsx
@@ -1,6 +1,7 @@
import { useActions, useMountedLogic, useValues } from 'kea'
import { useEffect } from 'react'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AUTH_NOTES, type AuthNotes } from 'scenes/authentication/shared/authScene/authNotes'
import { AuthScene } from 'scenes/authentication/shared/authScene/AuthScene'
import { AuthEntry } from 'scenes/authentication/shared/authStepViewed'
@@ -9,7 +10,6 @@ import { loginTelemetryLogic } from 'scenes/authentication/shared/loginTelemetry
import { passkeyLogic } from 'scenes/authentication/shared/passkeyLogic'
import { pendingOAuthConnectionLogic } from 'scenes/authentication/shared/pendingOAuthConnectionLogic'
import { RedirectIfLoggedInOtherInstance } from 'scenes/authentication/shared/RedirectToLoggedInInstance'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/authentication/auth/authLogic.ts b/frontend/src/scenes/authentication/auth/authLogic.ts
index a19c1157205b..baf3372388b1 100644
--- a/frontend/src/scenes/authentication/auth/authLogic.ts
+++ b/frontend/src/scenes/authentication/auth/authLogic.ts
@@ -2,9 +2,9 @@ import { MakeLogicType, actions, connect, kea, listeners, path, reducers, select
import { router, urlToAction } from 'kea-router'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { isEmail } from 'lib/utils/url'
import { AuthEntry, AuthStep } from 'scenes/authentication/shared/authStepViewed'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import type { PreflightStatus } from '~/types'
diff --git a/frontend/src/scenes/authentication/auth/authTelemetryLogic.ts b/frontend/src/scenes/authentication/auth/authTelemetryLogic.ts
index 0ee91da576f3..afd05db6f85d 100644
--- a/frontend/src/scenes/authentication/auth/authTelemetryLogic.ts
+++ b/frontend/src/scenes/authentication/auth/authTelemetryLogic.ts
@@ -2,8 +2,8 @@ import { MakeLogicType, connect, kea, listeners, path } from 'kea'
import { subscriptions } from 'kea-subscriptions'
import posthog from 'posthog-js'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { captureAuthStepViewed, pendingOAuthConnectionProperties } from 'scenes/authentication/shared/authStepViewed'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import type { PreflightStatus } from '../../../types'
import type { AuthEntry } from '../shared/authStepViewed'
diff --git a/frontend/src/scenes/authentication/auth/components/EmailStepSocialButtons.tsx b/frontend/src/scenes/authentication/auth/components/EmailStepSocialButtons.tsx
index a46104272b58..e566a8bfedfe 100644
--- a/frontend/src/scenes/authentication/auth/components/EmailStepSocialButtons.tsx
+++ b/frontend/src/scenes/authentication/auth/components/EmailStepSocialButtons.tsx
@@ -1,8 +1,8 @@
import { useValues } from 'kea'
import { SocialLoginButtons } from 'lib/components/SocialLoginButton/SocialLoginButton'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { useLastLoginMethod } from 'scenes/authentication/shared/lastLoginMethod'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { authLogic } from '../authLogic'
import { PrecheckResponseType, loginLogic } from '../loginLogic'
diff --git a/frontend/src/scenes/authentication/auth/components/JoinOrganizationHint.tsx b/frontend/src/scenes/authentication/auth/components/JoinOrganizationHint.tsx
index f210fda850af..47e974fbc04d 100644
--- a/frontend/src/scenes/authentication/auth/components/JoinOrganizationHint.tsx
+++ b/frontend/src/scenes/authentication/auth/components/JoinOrganizationHint.tsx
@@ -1,8 +1,8 @@
import { useValues } from 'kea'
import { useState } from 'react'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { authLogic } from '../authLogic'
diff --git a/frontend/src/scenes/authentication/auth/components/LoginErrorBanner.tsx b/frontend/src/scenes/authentication/auth/components/LoginErrorBanner.tsx
index b454f1d4c5bb..dd2572e6c7a5 100644
--- a/frontend/src/scenes/authentication/auth/components/LoginErrorBanner.tsx
+++ b/frontend/src/scenes/authentication/auth/components/LoginErrorBanner.tsx
@@ -3,9 +3,9 @@ import { useActions, useValues } from 'kea'
import { supportLogic } from 'lib/components/Support/supportLogic'
import { SSO_PROVIDER_NAMES } from 'lib/constants'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
import { ERROR_MESSAGES } from 'scenes/authentication/shared/loginErrorMessages'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { LoginMethod, Region, SSOProvider } from '~/types'
diff --git a/frontend/src/scenes/authentication/auth/components/OtherRegionNotice.tsx b/frontend/src/scenes/authentication/auth/components/OtherRegionNotice.tsx
index 7e189fe6e254..c3bb809ddb88 100644
--- a/frontend/src/scenes/authentication/auth/components/OtherRegionNotice.tsx
+++ b/frontend/src/scenes/authentication/auth/components/OtherRegionNotice.tsx
@@ -2,11 +2,11 @@ import clsx from 'clsx'
import { useValues } from 'kea'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { countryCodeToFlag } from 'lib/utils/country'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
import { otherRegionLoginUrl, otherRegionOf } from 'scenes/authentication/shared/otherRegion'
import { pendingOAuthConnectionLogic } from 'scenes/authentication/shared/pendingOAuthConnectionLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
/** `no_account` shows before an account is created. `login_failed` shows after a rejected password. */
export type OtherRegionReason = 'no_account' | 'login_failed'
diff --git a/frontend/src/scenes/authentication/auth/loginLogic.ts b/frontend/src/scenes/authentication/auth/loginLogic.ts
index ec8edf14c396..117f77f4be13 100644
--- a/frontend/src/scenes/authentication/auth/loginLogic.ts
+++ b/frontend/src/scenes/authentication/auth/loginLogic.ts
@@ -12,6 +12,7 @@ import { ApiError } from 'lib/api-error'
import { getSocialLoginUrl } from 'lib/components/SocialLoginButton/socialLoginUrl'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { isWebKitBrowser } from 'lib/utils/dom'
import { getCurrentTeamIdOrNone, isUserLoggedIn } from 'lib/utils/getAppContext'
import { getRelativeNextPath, isEmail } from 'lib/utils/url'
@@ -22,7 +23,6 @@ import {
setPendingVerificationEmail,
} from 'scenes/authentication/shared/verificationCode'
import { twoFactorResetLogic } from 'scenes/authentication/two-factor-reset/twoFactorResetLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { LoginMethod, SSOProvider } from '~/types'
diff --git a/frontend/src/scenes/authentication/auth/signupLogic.ts b/frontend/src/scenes/authentication/auth/signupLogic.ts
index 642ae169fee1..dcbb82301667 100644
--- a/frontend/src/scenes/authentication/auth/signupLogic.ts
+++ b/frontend/src/scenes/authentication/auth/signupLogic.ts
@@ -12,6 +12,7 @@ import { ValidatedPasswordResult, validatePassword } from 'lib/components/Passwo
import { getReferralFollowUp } from 'lib/components/SignupReferralSource'
import { CLOUD_HOSTNAMES, FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { splitFullName } from 'lib/utils/strings'
import { getRelativeNextPath } from 'lib/utils/url'
import { readPendingOAuthConnection } from 'scenes/authentication/shared/pendingOAuthConnectionLogic'
@@ -19,7 +20,6 @@ import {
clearPendingVerificationEmail,
setPendingVerificationEmail,
} from 'scenes/authentication/shared/verificationCode'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { getPasskeyErrorMessage, isWebAuthnCancellation } from 'scenes/settings/user/passkeys/utils'
import { RegistrationBeginResponse } from 'scenes/settings/user/passkeySettingsLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/authentication/auth/steps/SignupProfileStep.tsx b/frontend/src/scenes/authentication/auth/steps/SignupProfileStep.tsx
index ce38cce64442..78af0e7b10e3 100644
--- a/frontend/src/scenes/authentication/auth/steps/SignupProfileStep.tsx
+++ b/frontend/src/scenes/authentication/auth/steps/SignupProfileStep.tsx
@@ -8,11 +8,11 @@ import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
import { AuthCardTitle } from 'scenes/authentication/shared/authScene/AuthCardTitle'
import { AuthSceneCard } from 'scenes/authentication/shared/authScene/AuthScene'
import { TurnstileChallenge } from 'scenes/authentication/shared/TurnstileChallenge'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { signupLogic } from '../signupLogic'
diff --git a/frontend/src/scenes/authentication/invite-signup/InviteSignupForm.tsx b/frontend/src/scenes/authentication/invite-signup/InviteSignupForm.tsx
index b676b2d18402..aa5de282be04 100644
--- a/frontend/src/scenes/authentication/invite-signup/InviteSignupForm.tsx
+++ b/frontend/src/scenes/authentication/invite-signup/InviteSignupForm.tsx
@@ -19,6 +19,7 @@ import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
import { Link } from 'lib/lemon-ui/Link'
import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { loginLogic } from 'scenes/authentication/auth/loginLogic'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
import { AuthCardTitle } from 'scenes/authentication/shared/authScene/AuthCardTitle'
@@ -26,7 +27,6 @@ import { AUTH_NOTES } from 'scenes/authentication/shared/authScene/authNotes'
import { AuthScene, AuthSceneCard } from 'scenes/authentication/shared/authScene/AuthScene'
import { OrgTile } from 'scenes/authentication/shared/authScene/OrgTile'
import { TurnstileChallenge } from 'scenes/authentication/shared/TurnstileChallenge'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/authentication/login-2fa/Login2FA.tsx b/frontend/src/scenes/authentication/login-2fa/Login2FA.tsx
index b0f59e431f2b..4c180b4f4dbe 100644
--- a/frontend/src/scenes/authentication/login-2fa/Login2FA.tsx
+++ b/frontend/src/scenes/authentication/login-2fa/Login2FA.tsx
@@ -7,12 +7,12 @@ import passkeyLogo from 'lib/components/SocialLoginButton/passkey.svg'
import { supportLogic } from 'lib/components/Support/supportLogic'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AuthBanner } from 'scenes/authentication/shared/authScene/AuthBanner'
import { AuthCardTitle } from 'scenes/authentication/shared/authScene/AuthCardTitle'
import { AUTH_NOTES } from 'scenes/authentication/shared/authScene/authNotes'
import { AuthScene, AuthSceneCard } from 'scenes/authentication/shared/authScene/AuthScene'
import { loginTelemetryLogic } from 'scenes/authentication/shared/loginTelemetryLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { login2FALogic } from './login2FALogic'
diff --git a/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts b/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
index 68921b0b95b7..3cc135e4f6ec 100644
--- a/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
+++ b/frontend/src/scenes/authentication/login-2fa/login2FALogic.ts
@@ -7,8 +7,8 @@ import { urlToAction } from 'kea-router'
import api, { ApiError } from 'lib/api'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { redirectAfterLogin } from 'scenes/authentication/auth/loginLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { getPasskeyErrorMessage, isWebAuthnCancellation } from 'scenes/settings/user/passkeys/utils'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/authentication/password-reset/PasswordReset.tsx b/frontend/src/scenes/authentication/password-reset/PasswordReset.tsx
index 3f741c230de0..b1a9968b6cbb 100644
--- a/frontend/src/scenes/authentication/password-reset/PasswordReset.tsx
+++ b/frontend/src/scenes/authentication/password-reset/PasswordReset.tsx
@@ -13,12 +13,12 @@ import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
import { IconErrorOutline } from 'lib/lemon-ui/icons'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { AuthCardTitle } from 'scenes/authentication/shared/authScene/AuthCardTitle'
import { AUTH_NOTES } from 'scenes/authentication/shared/authScene/authNotes'
import { AuthScene, AuthSceneCard } from 'scenes/authentication/shared/authScene/AuthScene'
import { loginTelemetryLogic } from 'scenes/authentication/shared/loginTelemetryLogic'
import { SupportModalButton } from 'scenes/authentication/shared/SupportModalButton'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { passwordResetLogic } from './passwordResetLogic'
diff --git a/frontend/src/scenes/authentication/shared/RegionSelect.tsx b/frontend/src/scenes/authentication/shared/RegionSelect.tsx
index a98eb25f0c8d..ec7d27423026 100644
--- a/frontend/src/scenes/authentication/shared/RegionSelect.tsx
+++ b/frontend/src/scenes/authentication/shared/RegionSelect.tsx
@@ -8,8 +8,8 @@ import { LemonModal, LemonSelect, LemonTag } from '@posthog/lemon-ui'
import { CLOUD_HOSTNAMES } from 'lib/constants'
import { LemonField } from 'lib/lemon-ui/LemonField'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { oauthLogic } from 'lib/oauth/oauthLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Region } from '~/types'
diff --git a/frontend/src/scenes/authentication/shared/SupportModalButton.tsx b/frontend/src/scenes/authentication/shared/SupportModalButton.tsx
index ff412f9adc53..044d63dfb753 100644
--- a/frontend/src/scenes/authentication/shared/SupportModalButton.tsx
+++ b/frontend/src/scenes/authentication/shared/SupportModalButton.tsx
@@ -4,7 +4,7 @@ import { IconBug, IconQuestion } from '@posthog/icons'
import { LemonButton } from '@posthog/lemon-ui'
import { SupportTicketKind, supportLogic } from 'lib/components/Support/supportLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
interface SupportModalButtonProps {
name?: string
diff --git a/frontend/src/scenes/authentication/shared/authScene/DevLoginPanel.tsx b/frontend/src/scenes/authentication/shared/authScene/DevLoginPanel.tsx
index dceaffc6765f..1e5f27b328f7 100644
--- a/frontend/src/scenes/authentication/shared/authScene/DevLoginPanel.tsx
+++ b/frontend/src/scenes/authentication/shared/authScene/DevLoginPanel.tsx
@@ -7,10 +7,10 @@ import { dayjs } from 'lib/dayjs'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { Lettermark } from 'lib/lemon-ui/Lettermark'
import { Spinner } from 'lib/lemon-ui/Spinner'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { OAUTH_REGIONS } from 'lib/oauth/oauthClient'
import { oauthLogic } from 'lib/oauth/oauthLogic'
import { hashCodeForString } from 'lib/utils/strings'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Region } from '~/types'
diff --git a/frontend/src/scenes/authentication/shared/authScene/RegionField.tsx b/frontend/src/scenes/authentication/shared/authScene/RegionField.tsx
index e5e5ef6cbe2b..657e930139b5 100644
--- a/frontend/src/scenes/authentication/shared/authScene/RegionField.tsx
+++ b/frontend/src/scenes/authentication/shared/authScene/RegionField.tsx
@@ -6,9 +6,9 @@ import { IconCheckCircle } from '@posthog/icons'
import { LemonLabel, LemonModal, LemonSelect, LemonSelectOptions } from '@posthog/lemon-ui'
import { CLOUD_HOSTNAMES } from 'lib/constants'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { countryCodeToFlag } from 'lib/utils/country'
import { pendingOAuthConnectionLogic } from 'scenes/authentication/shared/pendingOAuthConnectionLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Region } from '~/types'
diff --git a/frontend/src/scenes/authentication/shared/loginTelemetryLogic.ts b/frontend/src/scenes/authentication/shared/loginTelemetryLogic.ts
index be802dbb38b2..e8f29c62d6c6 100644
--- a/frontend/src/scenes/authentication/shared/loginTelemetryLogic.ts
+++ b/frontend/src/scenes/authentication/shared/loginTelemetryLogic.ts
@@ -1,8 +1,8 @@
import { MakeLogicType, afterMount, connect, kea, listeners, path } from 'kea'
import posthog from 'posthog-js'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { loginLogic } from 'scenes/authentication/auth/loginLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { PreflightStatus } from '~/types'
diff --git a/frontend/src/scenes/authentication/two-factor-setup/TwoFactorSetupModal.tsx b/frontend/src/scenes/authentication/two-factor-setup/TwoFactorSetupModal.tsx
index 3aa52981cbd4..8274cd66a9ab 100644
--- a/frontend/src/scenes/authentication/two-factor-setup/TwoFactorSetupModal.tsx
+++ b/frontend/src/scenes/authentication/two-factor-setup/TwoFactorSetupModal.tsx
@@ -5,9 +5,10 @@ import { LemonBanner, LemonDivider } from '@posthog/lemon-ui'
import { OrganizationMenu } from 'lib/components/Account/OrganizationMenu'
import { LemonModal } from 'lib/lemon-ui/LemonModal'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
+
import { twoFactorLogic } from './twoFactorLogic'
import { TwoFactorSetup } from './TwoFactorSetup'
diff --git a/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts b/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
index 3a69adbdd2a8..c53627efea8b 100644
--- a/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
+++ b/frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
@@ -7,12 +7,12 @@ import { lemonToast } from '@posthog/lemon-ui'
import api from 'lib/api'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { usersTwoFactorStatusRetrieve } from '~/generated/core/api'
import type { TwoFactorStatusApi } from '~/generated/core/api.schemas'
+import { membersLogic } from '~/models/membersLogic'
import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
import type { PreflightStatus, UserType } from '../../../types'
diff --git a/frontend/src/scenes/billing/Billing.tsx b/frontend/src/scenes/billing/Billing.tsx
index 4894f1ecc56e..660a112a35c9 100644
--- a/frontend/src/scenes/billing/Billing.tsx
+++ b/frontend/src/scenes/billing/Billing.tsx
@@ -18,13 +18,13 @@ import { dayjs } from 'lib/dayjs'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { SpinnerOverlay } from 'lib/lemon-ui/Spinner/Spinner'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { toSentenceCase } from 'lib/utils/strings'
import { couponLogic } from 'scenes/coupons/couponLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
+import { membersLogic } from '~/models/membersLogic'
import { ProductKey } from '~/queries/schema/schema-general'
import { BillingProductV2Type } from '~/types'
diff --git a/frontend/src/scenes/billing/BillingProductAddonActions.tsx b/frontend/src/scenes/billing/BillingProductAddonActions.tsx
index 94c45f88c784..db16111f1971 100644
--- a/frontend/src/scenes/billing/BillingProductAddonActions.tsx
+++ b/frontend/src/scenes/billing/BillingProductAddonActions.tsx
@@ -7,7 +7,7 @@ import { LemonButton, LemonButtonProps, LemonTag } from '@posthog/lemon-ui'
import { TRIAL_CANCELLATION_SURVEY_ID, UNSUBSCRIBE_SURVEY_ID } from 'lib/constants'
import { More } from 'lib/lemon-ui/LemonButton/More'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { BillingProductV2AddonType } from '~/types'
diff --git a/frontend/src/scenes/billing/billingLogic.test.ts b/frontend/src/scenes/billing/billingLogic.test.ts
index f5b88d02fc87..0f28dabc7893 100644
--- a/frontend/src/scenes/billing/billingLogic.test.ts
+++ b/frontend/src/scenes/billing/billingLogic.test.ts
@@ -8,9 +8,9 @@ import posthog from 'posthog-js'
import { FEATURE_FLAGS, OrganizationMembershipLevel } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { BillingAPIErrorCodes, billingLogic } from 'scenes/billing/billingLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/billing/billingLogic.tsx b/frontend/src/scenes/billing/billingLogic.tsx
index ca01941f12da..b28aaa795d2c 100644
--- a/frontend/src/scenes/billing/billingLogic.tsx
+++ b/frontend/src/scenes/billing/billingLogic.tsx
@@ -17,10 +17,10 @@ import { LemonBannerAction } from 'lib/lemon-ui/LemonBanner/LemonBanner'
import { lemonBannerLogic } from 'lib/lemon-ui/LemonBanner/lemonBannerLogic'
import { LemonButtonPropsBase } from 'lib/lemon-ui/LemonButton'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { pluralize } from 'lib/utils/strings'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/billing/billingSpendLogic.ts b/frontend/src/scenes/billing/billingSpendLogic.ts
index 86b382623ace..f6286d544b43 100644
--- a/frontend/src/scenes/billing/billingSpendLogic.ts
+++ b/frontend/src/scenes/billing/billingSpendLogic.ts
@@ -9,9 +9,9 @@ import sortBy from 'lodash.sortby'
import { lemonToast } from '@posthog/lemon-ui'
import { dayjs } from 'lib/dayjs'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { dateMapping } from 'lib/utils/dateFilters'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Params } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/billing/billingUsageLogic.ts b/frontend/src/scenes/billing/billingUsageLogic.ts
index 284ff29f18e4..b89b0bda36e2 100644
--- a/frontend/src/scenes/billing/billingUsageLogic.ts
+++ b/frontend/src/scenes/billing/billingUsageLogic.ts
@@ -9,9 +9,9 @@ import sortBy from 'lodash.sortby'
import { lemonToast } from '@posthog/lemon-ui'
import { dayjs } from 'lib/dayjs'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { dateMapping } from 'lib/utils/dateFilters'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Params } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx b/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
index 41f4cb007ec0..b50a11c40444 100644
--- a/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
+++ b/frontend/src/scenes/data-management/definition/DefinitionEdit.tsx
@@ -27,6 +27,7 @@ import { LemonSelect } from 'lib/lemon-ui/LemonSelect'
import { LemonTextArea } from 'lib/lemon-ui/LemonTextArea/LemonTextArea'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { getPrimaryPropertyForEvent, hasTaxonomyPrimaryProperty } from 'lib/utils/events'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { definitionEditLogic } from 'scenes/data-management/definition/definitionEditLogic'
@@ -36,7 +37,6 @@ import {
definitionLogic,
} from 'scenes/data-management/definition/definitionLogic'
import { PropertyAccessControl } from 'scenes/data-management/definition/PropertyAccessControl'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts b/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
index 335a2eb9ef67..d40ad9f5fdce 100644
--- a/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
+++ b/frontend/src/scenes/data-management/definition/propertyAccessControlLogic.ts
@@ -2,9 +2,10 @@ import { MakeLogicType, actions, afterMount, kea, key, listeners, path, props, r
import { loaders } from 'kea-loaders'
import { captureAccessControlEvent } from 'lib/utils/accessControlUtils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
+import { membersLogic } from '~/models/membersLogic'
+
import {
propertyAccessControlsCreate,
propertyAccessControlsDestroy,
diff --git a/frontend/src/scenes/data-pipelines/batch-exports/BatchExportConfiguration.tsx b/frontend/src/scenes/data-pipelines/batch-exports/BatchExportConfiguration.tsx
index b463cc1baa43..55be5eb600b0 100644
--- a/frontend/src/scenes/data-pipelines/batch-exports/BatchExportConfiguration.tsx
+++ b/frontend/src/scenes/data-pipelines/batch-exports/BatchExportConfiguration.tsx
@@ -16,9 +16,9 @@ import { LemonInputSelect } from 'lib/lemon-ui/LemonInputSelect/LemonInputSelect
import { LemonLabel } from 'lib/lemon-ui/LemonLabel'
import { Spinner } from 'lib/lemon-ui/Spinner'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
import { DatabaseTable } from 'scenes/data-management/database/DatabaseTable'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { NodeKind } from '~/queries/schema/schema-general'
diff --git a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.test.ts b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.test.ts
index 93deb4bf268b..42916bcae9cb 100644
--- a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.test.ts
+++ b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.test.ts
@@ -1,7 +1,7 @@
import { router } from 'kea-router'
import { expectLogic } from 'kea-test-utils'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { useMocks } from '~/mocks/jest'
import { initKeaTests } from '~/test/init'
diff --git a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
index 13b5c169c76f..074288c3cd6b 100644
--- a/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
+++ b/frontend/src/scenes/hog-functions/email-templater/emailTemplaterLogic.tsx
@@ -22,8 +22,8 @@ import { LemonDialog } from '@posthog/lemon-ui'
import api from 'lib/api'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { objectsEqual } from 'lib/utils/objects'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { PreflightStatus, PropertyDefinition, PropertyDefinitionType, Realm } from '~/types'
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
index 4bb12584c79a..1728fb8f3b0e 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -27,6 +27,7 @@ import { IconChristmasOrnament, IconErrorOutline } from 'lib/lemon-ui/icons'
import { LemonMenuOverlay } from 'lib/lemon-ui/LemonMenu/LemonMenu'
import { Link } from 'lib/lemon-ui/Link'
import { LoadingBar } from 'lib/lemon-ui/LoadingBar'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import posthog from 'lib/posthog-typed'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
import { GraphSeriesAddedSource, eventUsageLogic } from 'lib/utils/eventUsageLogic'
@@ -35,7 +36,6 @@ import { humanFriendlyNumber, humanizeBytes } from 'lib/utils/numbers'
import { renderDetailWithLinks } from 'lib/utils/renderDetailWithLinks'
import { insightLogic, insightOverridesPresent } from 'scenes/insights/insightLogic'
import { autoRunMaxPrompt } from 'scenes/max/maxPrompt'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SavedInsightFilters } from 'scenes/saved-insights/savedInsightsLogic'
import { AIConsentPopoverWrapper } from 'scenes/settings/organization/AIConsentPopoverWrapper'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/scenes/insights/insightSceneLogic.tsx b/frontend/src/scenes/insights/insightSceneLogic.tsx
index 583015e2869f..6a1824467702 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.tsx
+++ b/frontend/src/scenes/insights/insightSceneLogic.tsx
@@ -17,6 +17,7 @@ import posthog from 'posthog-js'
import api from 'lib/api'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { trackedActionToUrl } from 'lib/logic/scenes/trackedActionToUrl'
import { InsightEventSource, sanitizeQuery } from 'lib/utils/eventUsageLogic'
import { isEmptyObject, isObject } from 'lib/utils/guards'
@@ -30,7 +31,6 @@ import {
import { createEmptyInsight, insightLogic } from 'scenes/insights/insightLogic'
import type { insightLogicType } from 'scenes/insights/insightLogic'
import { MaxContextInput, createMaxContextHelpers } from 'scenes/max/maxTypes'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { Scene } from 'scenes/sceneTypes'
import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'
diff --git a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
index 04c5cea63e6f..858c40ae5419 100644
--- a/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
+++ b/frontend/src/scenes/instance/AsyncMigrations/asyncMigrationsLogic.ts
@@ -4,8 +4,8 @@ import { actionToUrl, urlToAction } from 'kea-router'
import api from 'lib/api'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { systemStatusLogic } from 'scenes/instance/SystemStatus/systemStatusLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { InstanceSetting } from '~/types'
diff --git a/frontend/src/scenes/instance/SystemStatus/InstanceConfigTab.tsx b/frontend/src/scenes/instance/SystemStatus/InstanceConfigTab.tsx
index c867431f6aa1..dddfa12bbfc9 100644
--- a/frontend/src/scenes/instance/SystemStatus/InstanceConfigTab.tsx
+++ b/frontend/src/scenes/instance/SystemStatus/InstanceConfigTab.tsx
@@ -7,8 +7,8 @@ import { useKeyboardHotkeys } from 'lib/hooks/useKeyboardHotkeys'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { IconOpenInNew } from 'lib/lemon-ui/icons'
import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
+import { EnvironmentConfigOption, preflightLogic } from 'lib/logic/preflightLogic'
import { pluralize } from 'lib/utils/strings'
-import { EnvironmentConfigOption, preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { InstanceSetting } from '~/types'
diff --git a/frontend/src/scenes/instance/SystemStatus/index.tsx b/frontend/src/scenes/instance/SystemStatus/index.tsx
index f8988b09e22f..5e0c5d6f6555 100644
--- a/frontend/src/scenes/instance/SystemStatus/index.tsx
+++ b/frontend/src/scenes/instance/SystemStatus/index.tsx
@@ -7,9 +7,9 @@ import { LemonBanner, Link } from '@posthog/lemon-ui'
import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { InternalMetricsTab } from 'scenes/instance/SystemStatus/InternalMetricsTab'
import { OverviewTab } from 'scenes/instance/SystemStatus/OverviewTab'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
index f02b38c269d0..9bb20b87d9a3 100644
--- a/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
+++ b/frontend/src/scenes/instance/SystemStatus/systemStatusLogic.ts
@@ -5,8 +5,8 @@ import posthog from 'posthog-js'
import api from 'lib/api'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { isUserLoggedIn } from 'lib/utils/getAppContext'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { InstanceSetting, SystemStatus, SystemStatusQueriesResult, SystemStatusRow } from '~/types'
diff --git a/frontend/src/scenes/integrations/aws-s3/AwsS3SetupModal.test.tsx b/frontend/src/scenes/integrations/aws-s3/AwsS3SetupModal.test.tsx
index 1a8dbe9af53e..1915635297b9 100644
--- a/frontend/src/scenes/integrations/aws-s3/AwsS3SetupModal.test.tsx
+++ b/frontend/src/scenes/integrations/aws-s3/AwsS3SetupModal.test.tsx
@@ -6,7 +6,7 @@ import { cleanup, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { Provider } from 'kea'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { initKeaTests } from '~/test/init'
import { PreflightStatus, Region } from '~/types'
diff --git a/frontend/src/scenes/integrations/components/AwsRoleRequirements.tsx b/frontend/src/scenes/integrations/components/AwsRoleRequirements.tsx
index 9cdb9e3aeeea..599e38ca3ff9 100644
--- a/frontend/src/scenes/integrations/components/AwsRoleRequirements.tsx
+++ b/frontend/src/scenes/integrations/components/AwsRoleRequirements.tsx
@@ -1,7 +1,7 @@
import { useValues } from 'kea'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Region } from '~/types'
diff --git a/frontend/src/scenes/max/maxGlobalLogic.test.ts b/frontend/src/scenes/max/maxGlobalLogic.test.ts
index 5c108c22e8c8..1b1c28618274 100644
--- a/frontend/src/scenes/max/maxGlobalLogic.test.ts
+++ b/frontend/src/scenes/max/maxGlobalLogic.test.ts
@@ -4,7 +4,7 @@ import { expectLogic } from 'kea-test-utils'
import api from 'lib/api'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { aiConsentLogic } from 'scenes/settings/organization/aiConsentLogic'
import { useMocks } from '~/mocks/jest'
diff --git a/frontend/src/scenes/max/maxGlobalLogic.tsx b/frontend/src/scenes/max/maxGlobalLogic.tsx
index e98134f69715..210f978ec58f 100644
--- a/frontend/src/scenes/max/maxGlobalLogic.tsx
+++ b/frontend/src/scenes/max/maxGlobalLogic.tsx
@@ -8,9 +8,9 @@ import { FEATURE_FLAGS } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { newInternalTab } from 'lib/utils/newInternalTab'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { aiConsentLogic } from 'scenes/settings/organization/aiConsentLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/scenes/max/messages/useAnswerRating.ts b/frontend/src/scenes/max/messages/useAnswerRating.ts
index 06b340b34ac2..2eda16aa0156 100644
--- a/frontend/src/scenes/max/messages/useAnswerRating.ts
+++ b/frontend/src/scenes/max/messages/useAnswerRating.ts
@@ -2,7 +2,7 @@ import { useActions, useValues } from 'kea'
import posthog from 'posthog-js'
import { useState } from 'react'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/frontend/src/scenes/notebooks/Notebook/markdownNotebookRegistry.tsx b/frontend/src/scenes/notebooks/Notebook/markdownNotebookRegistry.tsx
index c107de155687..b74578ff3e4a 100644
--- a/frontend/src/scenes/notebooks/Notebook/markdownNotebookRegistry.tsx
+++ b/frontend/src/scenes/notebooks/Notebook/markdownNotebookRegistry.tsx
@@ -72,8 +72,8 @@ import { LemonFileInput } from 'lib/lemon-ui/LemonFileInput'
import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
import { Spinner } from 'lib/lemon-ui/Spinner'
import { type FeatureFlagsSet } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { uuid } from 'lib/utils/dom'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import 'products/notebooks/frontend/NotebookNodeGeneratedWidget/NotebookNodeGeneratedWidget'
import { NotebookGeneratedWidgetRunButton } from 'products/notebooks/frontend/NotebookNodeGeneratedWidget/NotebookGeneratedWidgetRunButton'
diff --git a/frontend/src/scenes/notebooks/NotebookSelectButton/QuillNotebookFilterMenu.tsx b/frontend/src/scenes/notebooks/NotebookSelectButton/QuillNotebookFilterMenu.tsx
index 64631f9db838..b850de1b9437 100644
--- a/frontend/src/scenes/notebooks/NotebookSelectButton/QuillNotebookFilterMenu.tsx
+++ b/frontend/src/scenes/notebooks/NotebookSelectButton/QuillNotebookFilterMenu.tsx
@@ -4,11 +4,11 @@ import { useMemo } from 'react'
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator } from '@posthog/quill'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
import { TodayFilterMenuTrigger } from '~/layout/today/TodayFilterMenuTrigger'
import { TodayRecentRadioSubmenu } from '~/layout/today/TodayRecentRadioSubmenu'
+import { membersLogic } from '~/models/membersLogic'
const ANY_USER = 'any'
diff --git a/frontend/src/scenes/onboarding/OnboardingInviteTeammates.tsx b/frontend/src/scenes/onboarding/OnboardingInviteTeammates.tsx
index 29531c999010..e2ae66c3e376 100644
--- a/frontend/src/scenes/onboarding/OnboardingInviteTeammates.tsx
+++ b/frontend/src/scenes/onboarding/OnboardingInviteTeammates.tsx
@@ -2,7 +2,7 @@ import { useActions, useValues } from 'kea'
import { LemonDivider } from '@posthog/lemon-ui'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { inviteLogic } from 'scenes/settings/organization/inviteLogic'
import { EmailUnavailableForInvitesBanner, InviteTeamMatesComponent } from 'scenes/settings/organization/InviteModal'
import { InvitesTable } from 'scenes/settings/organization/Invites'
diff --git a/frontend/src/scenes/onboarding/onboardingLogic.tsx b/frontend/src/scenes/onboarding/onboardingLogic.tsx
index 0b84fcac27d7..726e49fcd9dc 100644
--- a/frontend/src/scenes/onboarding/onboardingLogic.tsx
+++ b/frontend/src/scenes/onboarding/onboardingLogic.tsx
@@ -8,6 +8,7 @@ import { type SetupTaskId } from 'lib/components/ProductSetup'
import { globalSetupLogic } from 'lib/components/ProductSetup/globalSetupLogic'
import { OrganizationMembershipLevel } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { isKeyOf } from 'lib/utils/guards'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { getRelativeNextPath } from 'lib/utils/url'
@@ -19,7 +20,6 @@ import {
} from 'scenes/onboarding/onboardingUsage'
import { availableOnboardingProducts } from 'scenes/onboarding/shared/utils'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene } from 'scenes/sceneTypes'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/onboarding/shared/sdkHealth/SdkHealthScene.tsx b/frontend/src/scenes/onboarding/shared/sdkHealth/SdkHealthScene.tsx
index f9dc8bacc117..cb28ae545259 100644
--- a/frontend/src/scenes/onboarding/shared/sdkHealth/SdkHealthScene.tsx
+++ b/frontend/src/scenes/onboarding/shared/sdkHealth/SdkHealthScene.tsx
@@ -9,9 +9,9 @@ import { dayjs } from 'lib/dayjs'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
import { pluralize } from 'lib/utils/strings'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
index 464ba3108531..1d2a63d3ae30 100644
--- a/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
+++ b/frontend/src/scenes/onboarding/shared/sdkHealth/sdkHealthLogic.tsx
@@ -5,7 +5,7 @@ import { subscriptions } from 'kea-subscriptions'
import { lemonToast } from '@posthog/lemon-ui'
import { dayjs } from 'lib/dayjs'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { sdkHealthReportRetrieve } from 'products/growth/frontend/generated/api'
diff --git a/frontend/src/scenes/onboarding/shared/useWizardCommand.ts b/frontend/src/scenes/onboarding/shared/useWizardCommand.ts
index afc504fa367f..52c7f487e80b 100644
--- a/frontend/src/scenes/onboarding/shared/useWizardCommand.ts
+++ b/frontend/src/scenes/onboarding/shared/useWizardCommand.ts
@@ -1,6 +1,6 @@
import { useValues } from 'kea'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
const BASE_COMMAND = 'npx -y @posthog/wizard@latest'
diff --git a/frontend/src/scenes/organization/membersExportLogic.ts b/frontend/src/scenes/organization/membersExportLogic.ts
index be098ad17622..191320fc84cf 100644
--- a/frontend/src/scenes/organization/membersExportLogic.ts
+++ b/frontend/src/scenes/organization/membersExportLogic.ts
@@ -9,10 +9,10 @@ import { capitalizeFirstLetter, fullName } from 'lib/utils/strings'
import { slugify } from 'lib/utils/strings'
import { organizationLogic } from 'scenes/organizationLogic'
+import { membersLogic } from '~/models/membersLogic'
import { OrganizationMemberType } from '~/types'
import type { OrganizationType } from '../../types'
-import { membersLogic } from './membersLogic'
function escapeCsvField(value: string): string {
if (/[",\n\r]/.test(value)) {
diff --git a/frontend/src/scenes/sceneLogic.tsx b/frontend/src/scenes/sceneLogic.tsx
index bec3405d6da1..a2c74b27c7b9 100644
--- a/frontend/src/scenes/sceneLogic.tsx
+++ b/frontend/src/scenes/sceneLogic.tsx
@@ -24,6 +24,7 @@ import { trackFileSystemLogView } from 'lib/hooks/useFileSystemLogView'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { Spinner } from 'lib/lemon-ui/Spinner'
import { FeatureFlagsSet, featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { markBootPhase } from 'lib/utils/bootTiming'
import { getAppContext } from 'lib/utils/getAppContext'
import { isChunkLoadError } from 'lib/utils/isChunkLoadError'
@@ -60,7 +61,6 @@ import { handleLoginRedirect } from './authentication/auth/loginLogic'
import { parseCouponCampaign } from './coupons/utils'
import { isOnboardingRedirectSuppressed } from './onboarding/onboardingDelegationState'
import { organizationLogic } from './organizationLogic'
-import { preflightLogic } from './PreflightCheck/preflightLogic'
import { isPathOpenWhileProjectPendingDeletion, projectLogic } from './projectLogic'
import type { SceneProps } from './sceneTypes'
import { inviteLogic } from './settings/organization/inviteLogic'
diff --git a/frontend/src/scenes/session-recordings/components/AiRegexHelper/AiRegexHelper.tsx b/frontend/src/scenes/session-recordings/components/AiRegexHelper/AiRegexHelper.tsx
index d8e796c32981..b7aba9489a81 100644
--- a/frontend/src/scenes/session-recordings/components/AiRegexHelper/AiRegexHelper.tsx
+++ b/frontend/src/scenes/session-recordings/components/AiRegexHelper/AiRegexHelper.tsx
@@ -7,8 +7,8 @@ import posthog from 'posthog-js'
import { IconAI, IconCopy, IconPlus } from '@posthog/icons'
import { LemonBanner, LemonButton, LemonModal, LemonTextArea } from '@posthog/lemon-ui'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { maxGlobalLogic } from 'scenes/max/maxGlobalLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { AIConsentPopoverWrapper } from 'scenes/settings/organization/AIConsentPopoverWrapper'
import { aiRegexHelperLogic } from './aiRegexHelperLogic'
diff --git a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.test.ts b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.test.ts
index 37b50628cc25..c3484864b1d2 100644
--- a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.test.ts
+++ b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.test.ts
@@ -5,10 +5,10 @@ import { expectLogic } from 'kea-test-utils'
import api from 'lib/api'
import { dayjs } from 'lib/dayjs'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { sessionRecordingDataCoordinatorLogic } from 'scenes/session-recordings/player/sessionRecordingDataCoordinatorLogic'
import { sessionRecordingPlayerLogic } from 'scenes/session-recordings/player/sessionRecordingPlayerLogic'
+import { membersLogic } from '~/models/membersLogic'
import { CommentType } from '~/types'
import { recordingMetaJson } from '../../__mocks__/recording_meta'
diff --git a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
index 56ad5d5983a4..9d3ea9da06f6 100644
--- a/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/commenting/playerFrameCommentOverlayLogic.ts
@@ -10,10 +10,10 @@ import { JSONContent, RichContentEditorType } from 'lib/components/RichContentEd
import { Dayjs, dayjs } from 'lib/dayjs'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
import { colonDelimitedDuration } from 'lib/utils/durations'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { playerCommentModel } from 'scenes/session-recordings/player/commenting/playerCommentModel'
import { isSingleEmoji } from 'scenes/session-recordings/utils'
+import { membersLogic } from '~/models/membersLogic'
import { CommentType, OrganizationMemberType } from '~/types'
import type { SessionPlayerData } from '../../../../types'
diff --git a/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts b/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
index 74a042012d15..a04e8ea17d71 100644
--- a/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
+++ b/frontend/src/scenes/session-recordings/player/sessionRecordingPlayerLogic.ts
@@ -38,6 +38,7 @@ import { exportsLogic } from 'lib/components/ExportButton/exportsLogic'
import { FEATURE_FLAGS } from 'lib/constants'
import { dayjs, now } from 'lib/dayjs'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { findLastIndex } from 'lib/utils/arrays'
import { downloadFile } from 'lib/utils/dom'
import { clamp } from 'lib/utils/numbers'
@@ -46,7 +47,6 @@ import { openBillingPopupModal } from 'scenes/billing/BillingPopup'
import { MAX_SIDE_PANEL_ID } from 'scenes/max/components/PhaiSidePanelChat'
import { PhaiViewMode, maxGlobalLogic } from 'scenes/max/maxGlobalLogic'
import { autoRunMaxPrompt } from 'scenes/max/maxPrompt'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { playerCommentModel } from 'scenes/session-recordings/player/commenting/playerCommentModel'
import { sessionPlayerModalLogic } from 'scenes/session-recordings/player/modal/sessionPlayerModalLogic'
import { debugReplayChatLogic } from 'scenes/session-recordings/player/player-meta/debugReplayChatLogic'
diff --git a/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts b/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
index 4d9c82e5a827..8171f74ae799 100644
--- a/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
+++ b/frontend/src/scenes/session-recordings/sessionRecordingEventUsageLogic.ts
@@ -3,8 +3,8 @@ import posthog from 'posthog-js'
import { isLogEntryPropertyFilter, isValidPropertyFilter } from 'lib/components/PropertyFilters/utils'
import { isActionFilter, isEventFilter } from 'lib/components/UniversalFilters/utils'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { metricCount, metricHistogram } from 'lib/operationalMetrics'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { MiniFilterKey } from 'scenes/session-recordings/player/inspector/miniFiltersLogic'
import { InspectorListItemType } from 'scenes/session-recordings/player/inspector/playerInspectorLogic'
import { filtersFromUniversalFilterGroups } from 'scenes/session-recordings/utils'
diff --git a/frontend/src/scenes/settings/environment/IPAllowListInfo.tsx b/frontend/src/scenes/settings/environment/IPAllowListInfo.tsx
index b7e6d2451c72..17e68b908ffb 100644
--- a/frontend/src/scenes/settings/environment/IPAllowListInfo.tsx
+++ b/frontend/src/scenes/settings/environment/IPAllowListInfo.tsx
@@ -1,7 +1,7 @@
import { useValues } from 'kea'
import { CodeSnippet } from 'lib/components/CodeSnippet'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
export function IPAllowListInfo(): JSX.Element {
const { preflight } = useValues(preflightLogic)
diff --git a/frontend/src/scenes/settings/environment/ManagedReverseProxy.tsx b/frontend/src/scenes/settings/environment/ManagedReverseProxy.tsx
index f7e32fd5813a..90f2458af12c 100644
--- a/frontend/src/scenes/settings/environment/ManagedReverseProxy.tsx
+++ b/frontend/src/scenes/settings/environment/ManagedReverseProxy.tsx
@@ -25,9 +25,9 @@ import { OrganizationMembershipLevel } from 'lib/constants'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { isKeyOf } from 'lib/utils/guards'
import { useMaxTool } from 'scenes/max/useMaxTool'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { useAttachedContext } from 'products/posthog_ai/frontend/api/logics'
diff --git a/frontend/src/scenes/settings/environment/TeamSettings.tsx b/frontend/src/scenes/settings/environment/TeamSettings.tsx
index 8339ef7a3cb9..4dfafb45eae8 100644
--- a/frontend/src/scenes/settings/environment/TeamSettings.tsx
+++ b/frontend/src/scenes/settings/environment/TeamSettings.tsx
@@ -11,9 +11,9 @@ import { RestrictionScope, useRestrictedArea } from 'lib/components/RestrictedAr
import { TeamMembershipLevel } from 'lib/constants'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { userHasAccess } from 'lib/utils/accessControlUtils'
import { inStorybook, inStorybookTestRunner } from 'lib/utils/dom'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { AccessControlLevel, AccessControlResourceType } from '~/types'
diff --git a/frontend/src/scenes/settings/environment/TimezoneConfig.test.tsx b/frontend/src/scenes/settings/environment/TimezoneConfig.test.tsx
index 30ee82430264..94dc2ed2fc70 100644
--- a/frontend/src/scenes/settings/environment/TimezoneConfig.test.tsx
+++ b/frontend/src/scenes/settings/environment/TimezoneConfig.test.tsx
@@ -7,7 +7,7 @@ import userEvent from '@testing-library/user-event'
import { expectLogic } from 'kea-test-utils'
import { OrganizationMembershipLevel } from 'lib/constants'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { initKeaTests } from '~/test/init'
diff --git a/frontend/src/scenes/settings/environment/TimezoneConfig.tsx b/frontend/src/scenes/settings/environment/TimezoneConfig.tsx
index e15b24dc4c07..dd03ca200d59 100644
--- a/frontend/src/scenes/settings/environment/TimezoneConfig.tsx
+++ b/frontend/src/scenes/settings/environment/TimezoneConfig.tsx
@@ -5,8 +5,8 @@ import { TeamMembershipLevel } from 'lib/constants'
import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
import { LemonInputSelect } from 'lib/lemon-ui/LemonInputSelect/LemonInputSelect'
import { LemonSkeleton } from 'lib/lemon-ui/LemonSkeleton'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
export function TimezoneConfig({ displayWarning = true }: { displayWarning?: boolean }): JSX.Element {
diff --git a/frontend/src/scenes/settings/organization/Approvals/ApprovalPolicies.tsx b/frontend/src/scenes/settings/organization/Approvals/ApprovalPolicies.tsx
index 6116ea978e2f..f60cfba2aab7 100644
--- a/frontend/src/scenes/settings/organization/Approvals/ApprovalPolicies.tsx
+++ b/frontend/src/scenes/settings/organization/Approvals/ApprovalPolicies.tsx
@@ -30,9 +30,9 @@ import {
EXPERIMENT_APPROVAL_ACTIONS,
getApprovalActionLabel,
} from 'scenes/approvals/utils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
+import { membersLogic } from '~/models/membersLogic'
import { ApprovalPolicy, AvailableFeature } from '~/types'
import { approvalPoliciesLogic } from './approvalPoliciesLogic'
diff --git a/frontend/src/scenes/settings/organization/IdentityProviderConfig/IdentityProviderConfigScene.tsx b/frontend/src/scenes/settings/organization/IdentityProviderConfig/IdentityProviderConfigScene.tsx
index 2b6fd877f68e..e4bfa197ba18 100644
--- a/frontend/src/scenes/settings/organization/IdentityProviderConfig/IdentityProviderConfigScene.tsx
+++ b/frontend/src/scenes/settings/organization/IdentityProviderConfig/IdentityProviderConfigScene.tsx
@@ -11,7 +11,7 @@ import { TimeSensitiveAuthenticationArea } from 'lib/components/TimeSensitiveAut
import { OrganizationMembershipLevel } from 'lib/constants'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import type { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/scenes/settings/organization/InviteModal.tsx b/frontend/src/scenes/settings/organization/InviteModal.tsx
index 3fd42c8d907e..cd4cd71fe67f 100644
--- a/frontend/src/scenes/settings/organization/InviteModal.tsx
+++ b/frontend/src/scenes/settings/organization/InviteModal.tsx
@@ -12,11 +12,11 @@ import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { LemonModal } from 'lib/lemon-ui/LemonModal'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationMembershipLevelIntegers } from 'lib/utils/permissioning'
import { capitalizeFirstLetter, pluralize } from 'lib/utils/strings'
import { isEmail } from 'lib/utils/url'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { AccessControlLevel, AvailableFeature } from '~/types'
diff --git a/frontend/src/scenes/settings/organization/Invites.tsx b/frontend/src/scenes/settings/organization/Invites.tsx
index df375c61e338..74bf4f18c13c 100644
--- a/frontend/src/scenes/settings/organization/Invites.tsx
+++ b/frontend/src/scenes/settings/organization/Invites.tsx
@@ -12,8 +12,8 @@ import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
import { LemonTable, LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
import { createdAtColumn, createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { OrganizationInviteType } from '~/types'
diff --git a/frontend/src/scenes/settings/organization/Members.tsx b/frontend/src/scenes/settings/organization/Members.tsx
index 7351cde40c60..518f6f78c193 100644
--- a/frontend/src/scenes/settings/organization/Members.tsx
+++ b/frontend/src/scenes/settings/organization/Members.tsx
@@ -18,6 +18,7 @@ import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
import { Link } from 'lib/lemon-ui/Link'
import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import {
getReasonForAccessLevelChangeProhibition,
membershipLevelToName,
@@ -26,11 +27,10 @@ import {
import { capitalizeFirstLetter, fullName, fullNameOrEmail } from 'lib/utils/strings'
import { twoFactorLogic } from 'scenes/authentication/two-factor-setup/twoFactorLogic'
import { membersExportLogic } from 'scenes/organization/membersExportLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { AvailableFeature, OrganizationMemberType } from '~/types'
import { accessibleProjects, orderByActivity } from './memberProjectAccess'
diff --git a/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
index 7c79ad13dde3..1a65b9cdd752 100644
--- a/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
+++ b/frontend/src/scenes/settings/organization/Permissions/Roles/rolesLogic.tsx
@@ -3,8 +3,8 @@ import { loaders } from 'kea-loaders'
import posthog from 'posthog-js'
import api from 'lib/api'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { RoleMemberType, RoleType, UserBasicType } from '~/types'
import type { OrganizationMemberType } from '../../../../../types'
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
index 3cc7b2c16a67..141494b7ec6f 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/ConfigureSAMLModal.tsx
@@ -11,7 +11,7 @@ import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
import { LemonModal } from 'lib/lemon-ui/LemonModal'
import { LemonTextArea } from 'lib/lemon-ui/LemonTextArea/LemonTextArea'
import { Spinner } from 'lib/lemon-ui/Spinner'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { verifiedDomainsLogic } from './verifiedDomainsLogic'
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx
index 48bdcbda2544..926a7659906f 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/SSOSelect.tsx
@@ -4,7 +4,7 @@ import { LemonSelect, LemonSelectOptions } from '@posthog/lemon-ui'
import { SocialLoginIcon } from 'lib/components/SocialLoginButton/SocialLoginIcon'
import { SSO_PROVIDER_NAMES } from 'lib/constants'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { SSOProvider } from '~/types'
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
index 7679dfab8a85..efc008a00fdb 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/VerifiedDomains.tsx
@@ -15,8 +15,8 @@ import { LemonTag, LemonTagType } from 'lib/lemon-ui/LemonTag/LemonTag'
import { Link } from 'lib/lemon-ui/Link'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { ConfigScopeEnumApi } from '~/generated/core/api.schemas'
diff --git a/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainImpactLogic.ts b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainImpactLogic.ts
index 5c463065f104..d4196bcf18c8 100644
--- a/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainImpactLogic.ts
+++ b/frontend/src/scenes/settings/organization/VerifiedDomains/verifiedDomainImpactLogic.ts
@@ -4,9 +4,9 @@ import { loaders } from 'kea-loaders'
import api, { CountedPaginatedResponse } from 'lib/api'
import { OrganizationMembershipLevel } from 'lib/constants'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
+import { membersLogic } from '~/models/membersLogic'
import { OrganizationDomainType, OrganizationMemberType, OrganizationType } from '~/types'
import { verifiedDomainsLogic } from './verifiedDomainsLogic'
diff --git a/frontend/src/scenes/settings/organization/inviteLogic.test.ts b/frontend/src/scenes/settings/organization/inviteLogic.test.ts
index a8051e990a47..de76cb89735c 100644
--- a/frontend/src/scenes/settings/organization/inviteLogic.test.ts
+++ b/frontend/src/scenes/settings/organization/inviteLogic.test.ts
@@ -2,8 +2,7 @@ import { MOCK_DEFAULT_ORGANIZATION } from 'lib/api.mock'
import { expectLogic } from 'kea-test-utils'
-import { membersLogic } from 'scenes/organization/membersLogic'
-
+import { membersLogic } from '~/models/membersLogic'
import { initKeaTests } from '~/test/init'
import { inviteLogic } from './inviteLogic'
diff --git a/frontend/src/scenes/settings/organization/inviteLogic.ts b/frontend/src/scenes/settings/organization/inviteLogic.ts
index 4bcd36607d0d..9a975a39bfd8 100644
--- a/frontend/src/scenes/settings/organization/inviteLogic.ts
+++ b/frontend/src/scenes/settings/organization/inviteLogic.ts
@@ -6,12 +6,12 @@ import { timeSensitiveAuthenticationLogic } from 'lib/components/TimeSensitiveAu
import { OrganizationMembershipLevel } from 'lib/constants'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { bindModalToUrl } from 'lib/logic/bindModalToUrl'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { pluralize } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { AccessControlLevel, OrganizationInviteType, OrganizationMemberType, UserType } from '~/types'
import type { PreflightStatus } from '../../../types'
diff --git a/frontend/src/scenes/settings/settingsLogic.ts b/frontend/src/scenes/settings/settingsLogic.ts
index 5dac735cf8da..44d2d420a691 100644
--- a/frontend/src/scenes/settings/settingsLogic.ts
+++ b/frontend/src/scenes/settings/settingsLogic.ts
@@ -5,10 +5,10 @@ import posthog from 'posthog-js'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { createFuse } from 'lib/utils/fuseSearch'
import { billingLogic } from 'scenes/billing/billingLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import type { Params } from 'scenes/sceneTypes'
import { organizationIntegrationsLogic } from 'scenes/settings/organization/organizationIntegrationsLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx b/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
index 824231d0c725..a294dca4be65 100644
--- a/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
+++ b/frontend/src/scenes/settings/user/PersonalAPIKeys.tsx
@@ -25,8 +25,8 @@ import { dayjs } from 'lib/dayjs'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { Link } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { API_KEY_SCOPE_PRESETS, DEFAULT_MAX_API_KEYS_PER_USER } from 'lib/scopes'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { PersonalAPIKeyType } from '~/types'
diff --git a/frontend/src/scenes/settings/user/TwoFactorSettings.tsx b/frontend/src/scenes/settings/user/TwoFactorSettings.tsx
index 189f975e8155..5ede0539e5d2 100644
--- a/frontend/src/scenes/settings/user/TwoFactorSettings.tsx
+++ b/frontend/src/scenes/settings/user/TwoFactorSettings.tsx
@@ -13,9 +13,9 @@ import {
import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { twoFactorLogic } from 'scenes/authentication/two-factor-setup/twoFactorLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { UserType } from '~/types'
export function TwoFactorSettings(): JSX.Element {
diff --git a/frontend/src/scenes/settings/user/remindersLogic.ts b/frontend/src/scenes/settings/user/remindersLogic.ts
index 05c98c83add0..fd71838760ff 100644
--- a/frontend/src/scenes/settings/user/remindersLogic.ts
+++ b/frontend/src/scenes/settings/user/remindersLogic.ts
@@ -5,9 +5,9 @@ import { loaders } from 'kea-loaders'
import { dayjs } from 'lib/dayjs'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import {
remindersCreate,
diff --git a/frontend/src/scenes/web-analytics/SessionAttributionExplorer/SessionAttributionExplorerScene.tsx b/frontend/src/scenes/web-analytics/SessionAttributionExplorer/SessionAttributionExplorerScene.tsx
index 9be9205b10df..5baf8eb1f380 100644
--- a/frontend/src/scenes/web-analytics/SessionAttributionExplorer/SessionAttributionExplorerScene.tsx
+++ b/frontend/src/scenes/web-analytics/SessionAttributionExplorer/SessionAttributionExplorerScene.tsx
@@ -10,7 +10,7 @@ import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { Link } from 'lib/lemon-ui/Link'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { SceneBreadcrumbBackButton } from '~/layout/scenes/components/SceneBreadcrumbs'
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx b/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
index 3f5c443762ae..9f14df8f060a 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
+++ b/frontend/src/scenes/web-analytics/webAnalyticsLogic.tsx
@@ -33,6 +33,7 @@ import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { Link } from 'lib/lemon-ui/Link/Link'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { buildTeamScopedPersistenceConfig } from 'lib/logic/persistence'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { trackedActionToUrl } from 'lib/logic/scenes/trackedActionToUrl'
import { getDefaultInterval, isValidRelativeOrAbsoluteDate } from 'lib/utils/dateFilters'
import { isDefinitionStale } from 'lib/utils/definitions'
@@ -40,7 +41,6 @@ import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { UnexpectedNeverError, isNotNil } from 'lib/utils/guards'
import { objectsEqual } from 'lib/utils/objects'
import { addProductIntentForCrossSell } from 'lib/utils/product-intents'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene } from 'scenes/sceneTypes'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/frontend/src/test/init.ts b/frontend/src/test/init.ts
index 95454ad3d427..ebf5092dd9b6 100644
--- a/frontend/src/test/init.ts
+++ b/frontend/src/test/init.ts
@@ -6,8 +6,8 @@ import posthog from 'posthog-js'
import { clearAllCachedHasData } from 'lib/components/ProductEmptyState/setupDetectionLogic'
import { dayjs } from 'lib/dayjs'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { projectLogic } from 'scenes/projectLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/frontend/src/toolbar/shared/shims/shimConsumerIntegration.test.ts b/frontend/src/toolbar/shared/shims/shimConsumerIntegration.test.ts
index f8475e0e0106..a1138f2eb0cc 100644
--- a/frontend/src/toolbar/shared/shims/shimConsumerIntegration.test.ts
+++ b/frontend/src/toolbar/shared/shims/shimConsumerIntegration.test.ts
@@ -1,5 +1,5 @@
jest.mock('scenes/userLogic', () => require('~/toolbar/shared/shims/userLogic'))
-jest.mock('scenes/organization/membersLogic', () => require('~/toolbar/shared/shims/membersLogic'))
+jest.mock('~/models/membersLogic', () => require('~/toolbar/shared/shims/membersLogic'))
jest.mock('scenes/sceneLogic', () => require('~/toolbar/shared/shims/sceneLogic'))
jest.mock('scenes/teamLogic', () => require('~/toolbar/shared/shims/teamLogic'))
jest.mock('lib/logic/featureFlagLogic', () => require('~/toolbar/shared/shims/featureFlagLogic'))
diff --git a/frontend/toolbar-config.mjs b/frontend/toolbar-config.mjs
index 71dbda2ff97d..46f9704734ca 100644
--- a/frontend/toolbar-config.mjs
+++ b/frontend/toolbar-config.mjs
@@ -23,7 +23,7 @@ const toolbarPublicPathOverride = process.env.TOOLBAR_PUBLIC_PATH
// will silently return undefined — keep shims in sync when connect contracts change.
const shimmedModules = {
'scenes/userLogic': 'src/toolbar/shared/shims/userLogic.ts',
- 'scenes/organization/membersLogic': 'src/toolbar/shared/shims/membersLogic.ts',
+ 'models/membersLogic': 'src/toolbar/shared/shims/membersLogic.ts',
'scenes/sceneLogic': 'src/toolbar/shared/shims/sceneLogic.ts',
'scenes/teamLogic': 'src/toolbar/shared/shims/teamLogic.ts',
'lib/logic/featureFlagLogic': 'src/toolbar/shared/shims/featureFlagLogic.ts',
diff --git a/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx b/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
index 0ed8caf88d47..9f5acf56c613 100644
--- a/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
+++ b/products/conversations/frontend/components/Assignee/assigneeSelectLogic.tsx
@@ -2,9 +2,9 @@ import Fuse from 'fuse.js'
import { MakeLogicType, actions, connect, kea, listeners, path, reducers, selectors } from 'kea'
import { createFuse } from 'lib/utils/fuseSearch'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
+import { membersLogic } from '~/models/membersLogic'
import type { RoleType } from '~/types'
import type { OrganizationMemberType } from '../../../../../frontend/src/types'
diff --git a/products/conversations/frontend/components/Editor/SupportEditor.tsx b/products/conversations/frontend/components/Editor/SupportEditor.tsx
index f9a904cbc5fc..86661d6ac7d9 100644
--- a/products/conversations/frontend/components/Editor/SupportEditor.tsx
+++ b/products/conversations/frontend/components/Editor/SupportEditor.tsx
@@ -41,9 +41,9 @@ import { emojiUsageLogic } from 'lib/lemon-ui/LemonTextArea/emojiUsageLogic'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
import { Popover } from 'lib/lemon-ui/Popover'
import { Spinner } from 'lib/lemon-ui/Spinner'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { cn } from 'lib/utils/css-classes'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
const lowlight = createLowlight(common)
lowlight.register('plaintext', () => ({ contains: [] }))
diff --git a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.test.ts b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.test.ts
index 2cdd85dcfcf6..8a824ac2e85b 100644
--- a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.test.ts
+++ b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.test.ts
@@ -4,9 +4,9 @@ import posthog from 'posthog-js'
import { CONVERSATIONS_MESSAGE_MAX_LENGTH, supportLogic } from 'lib/components/Support/supportLogic'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { billingLogic } from 'scenes/billing/billingLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
diff --git a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
index dde7d04eae9c..6d7e9bcf7620 100644
--- a/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
+++ b/products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
@@ -26,10 +26,10 @@ import {
warnSupportWidgetUnavailable,
} from 'lib/components/Support/supportLogic'
import { EMAIL_SUPPORT_BUTTON, lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { billingLogic } from 'scenes/billing/billingLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/products/conversations/frontend/components/SlaBusinessHours/CyclotronJobInputBusinessHours.tsx b/products/conversations/frontend/components/SlaBusinessHours/CyclotronJobInputBusinessHours.tsx
index 5c8181f3dae1..045686ff5fec 100644
--- a/products/conversations/frontend/components/SlaBusinessHours/CyclotronJobInputBusinessHours.tsx
+++ b/products/conversations/frontend/components/SlaBusinessHours/CyclotronJobInputBusinessHours.tsx
@@ -3,8 +3,8 @@ import { useValues } from 'kea'
import { LemonDivider, LemonInputSelect, LemonLabel, LemonSelect } from '@posthog/lemon-ui'
import type { CustomInputRendererProps } from 'lib/components/CyclotronJob/customInputRenderers'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { WeekdayType } from '~/types'
diff --git a/products/conversations/frontend/scenes/myTickets/MyTicketsScene.tsx b/products/conversations/frontend/scenes/myTickets/MyTicketsScene.tsx
index 49a9263926e2..c17593c15dbb 100644
--- a/products/conversations/frontend/scenes/myTickets/MyTicketsScene.tsx
+++ b/products/conversations/frontend/scenes/myTickets/MyTicketsScene.tsx
@@ -2,7 +2,7 @@ import { useValues } from 'kea'
import { Link, Spinner } from '@posthog/lemon-ui'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { SceneContent } from '~/layout/scenes/components/SceneContent'
diff --git a/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.test.ts b/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.test.ts
index 3f5ef91d2917..527c28146f38 100644
--- a/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.test.ts
+++ b/products/conversations/frontend/scenes/tickets/supportTicketsSceneLogic.test.ts
@@ -3,11 +3,11 @@ import { MOCK_DEFAULT_ORGANIZATION_MEMBER } from 'lib/api.mock'
import { router } from 'kea-router'
import { expectLogic } from 'kea-test-utils'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { Scene } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
import { useMocks } from '~/mocks/jest'
+import { membersLogic } from '~/models/membersLogic'
import { initKeaTests } from '~/test/init'
import { AccessControlLevel } from '~/types'
diff --git a/products/customer_analytics/frontend/components/Accounts/AccountsTable.tsx b/products/customer_analytics/frontend/components/Accounts/AccountsTable.tsx
index 97c8b2966c0c..597ab9859208 100644
--- a/products/customer_analytics/frontend/components/Accounts/AccountsTable.tsx
+++ b/products/customer_analytics/frontend/components/Accounts/AccountsTable.tsx
@@ -28,9 +28,9 @@ import { Link } from 'lib/lemon-ui/Link'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { percentage } from 'lib/utils/numbers'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { urls } from 'scenes/urls'
+import { membersLogic } from '~/models/membersLogic'
import { tagsModel } from '~/models/tagsModel'
import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { DataTable } from '~/queries/nodes/DataTable/DataTable'
diff --git a/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts b/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
index f9445b15c2c7..17f0d9150b76 100644
--- a/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
+++ b/products/customer_analytics/frontend/components/Accounts/accountsLogic.ts
@@ -10,11 +10,11 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { isUUIDLike } from 'lib/utils/guards'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { objectsEqual } from 'lib/utils/objects'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { tagsModel } from '~/models/tagsModel'
import { type DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import type { DataTableRow } from '~/queries/nodes/DataTable/dataTableLogic'
diff --git a/products/customer_analytics/frontend/components/CustomerTasks/customerTasksAssigneeDropdownLogic.ts b/products/customer_analytics/frontend/components/CustomerTasks/customerTasksAssigneeDropdownLogic.ts
index d0822c41b8ed..e5db83e2720b 100644
--- a/products/customer_analytics/frontend/components/CustomerTasks/customerTasksAssigneeDropdownLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerTasks/customerTasksAssigneeDropdownLogic.ts
@@ -1,9 +1,9 @@
import { MakeLogicType, LogicWrapper, actions, connect, kea, path, reducers, selectors } from 'kea'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
+import { membersLogic } from '~/models/membersLogic'
import type { OrganizationMemberType, RoleType } from '~/types'
import { isRoleAssigneeFilter, type CustomerTaskAssigneeFilter } from './customerTaskFilters'
diff --git a/products/customer_analytics/frontend/components/FeatureRequests/featureRequestsLogic.ts b/products/customer_analytics/frontend/components/FeatureRequests/featureRequestsLogic.ts
index b02a362f563c..40008b4dc7d8 100644
--- a/products/customer_analytics/frontend/components/FeatureRequests/featureRequestsLogic.ts
+++ b/products/customer_analytics/frontend/components/FeatureRequests/featureRequestsLogic.ts
@@ -11,10 +11,11 @@ import { ApiError } from 'lib/api'
import { uploadFile } from 'lib/hooks/useUploadFiles'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { uuid } from 'lib/utils/dom'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
+import { membersLogic } from '~/models/membersLogic'
+
import type { OrganizationMemberType, TeamPublicType, TeamType, UserBasicType } from '../../../../../frontend/src/types'
import {
accountsList,
diff --git a/products/customer_analytics/frontend/scenes/CustomerAnalyticsAccountScene/accountSidebarPropertiesLogic.ts b/products/customer_analytics/frontend/scenes/CustomerAnalyticsAccountScene/accountSidebarPropertiesLogic.ts
index be9003fb7496..f96071ec12c8 100644
--- a/products/customer_analytics/frontend/scenes/CustomerAnalyticsAccountScene/accountSidebarPropertiesLogic.ts
+++ b/products/customer_analytics/frontend/scenes/CustomerAnalyticsAccountScene/accountSidebarPropertiesLogic.ts
@@ -17,8 +17,8 @@ import { loaders } from 'kea-loaders'
import posthog from 'posthog-js'
import { userHasAccess } from 'lib/utils/accessControlUtils'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { AccessControlLevel, AccessControlResourceType, OrganizationMemberType } from '~/types'
diff --git a/products/data_warehouse/frontend/scenes/DataOpsScene/tabs/warehouseProvisioningLogic.ts b/products/data_warehouse/frontend/scenes/DataOpsScene/tabs/warehouseProvisioningLogic.ts
index 22b473c81c41..6fa22a9a5238 100644
--- a/products/data_warehouse/frontend/scenes/DataOpsScene/tabs/warehouseProvisioningLogic.ts
+++ b/products/data_warehouse/frontend/scenes/DataOpsScene/tabs/warehouseProvisioningLogic.ts
@@ -3,8 +3,8 @@ import { loaders } from 'kea-loaders'
import posthog from 'posthog-js'
import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { addProductIntent } from 'lib/utils/product-intents'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { ProductIntentContext, ProductKey } from '~/queries/schema/schema-general'
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx b/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
index 9994bdd6b3a4..9cb4d194269b 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/NewSourceScene.tsx
@@ -21,9 +21,9 @@ import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useFloatingContainer } from 'lib/hooks/useFloatingContainerContext'
import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { useAttachedLogic } from 'lib/logic/scenes/useAttachedLogic'
import { copyToClipboard } from 'lib/utils/copyToClipboard'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene, SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
index adb37d402e99..4bc9f17409f8 100644
--- a/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
+++ b/products/data_warehouse/frontend/scenes/NewSourceScene/sourceWizardLogic.tsx
@@ -12,8 +12,8 @@ import { tryShowMCPHint } from 'lib/components/MCPHint/mcpHintLogic'
import { SetupTaskId, globalSetupLogic } from 'lib/components/ProductSetup'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { captureMarketingCrossSellSourceCreated, getMarketingCrossSellAttribution } from 'lib/marketingCrossSell'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene } from 'scenes/sceneTypes'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/products/data_warehouse/frontend/shared/components/WarehouseWizardHint.tsx b/products/data_warehouse/frontend/shared/components/WarehouseWizardHint.tsx
index 7b055bae8f9c..95a019ebf7bc 100644
--- a/products/data_warehouse/frontend/shared/components/WarehouseWizardHint.tsx
+++ b/products/data_warehouse/frontend/shared/components/WarehouseWizardHint.tsx
@@ -7,8 +7,8 @@ import { LemonButton } from '@posthog/lemon-ui'
import { CommandBlock } from 'lib/components/CommandBlock/CommandBlock'
import { AgentBadgeRotator } from 'lib/components/MCPHint/AgentBadgeRotator'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { cn } from 'lib/utils/css-classes'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
// Persist dismissal so the hint doesn't nag a user who has seen it. Mirrors the MCP hint cards.
const DISMISSED_KEY = 'warehouse-wizard-hint-dismissed'
diff --git a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.test.ts b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.test.ts
index 9c83ba821696..9571c9919973 100644
--- a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.test.ts
+++ b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.test.ts
@@ -5,9 +5,9 @@ import { expectLogic } from 'kea-test-utils'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { OutputTab, outputPaneLogic } from 'scenes/data-warehouse/editor/outputPaneLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { dataVisualizationLogic } from '~/queries/nodes/DataVisualization/dataVisualizationLogic'
diff --git a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
index a171eba5cd47..fd143d06b09e 100644
--- a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
+++ b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
@@ -15,9 +15,9 @@ import { loaders } from 'kea-loaders'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { withTimeout } from 'lib/utils/async'
import { OutputTab, outputPaneLogic } from 'scenes/data-warehouse/editor/outputPaneLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { aiConsentLogic } from 'scenes/settings/organization/aiConsentLogic'
import { teamLogic } from 'scenes/teamLogic'
diff --git a/products/early_access_features/frontend/InstructionsModal.tsx b/products/early_access_features/frontend/InstructionsModal.tsx
index 9360856961f4..89ad7d21f579 100644
--- a/products/early_access_features/frontend/InstructionsModal.tsx
+++ b/products/early_access_features/frontend/InstructionsModal.tsx
@@ -3,7 +3,7 @@ import { useValues } from 'kea'
import { LemonCollapse, LemonModal, Link } from '@posthog/lemon-ui'
import { CodeSnippet, Language } from 'lib/components/CodeSnippet'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { urls } from 'scenes/urls'
import { FeatureFlagType } from '~/types'
diff --git a/products/early_access_features/frontend/earlyAccessFeatureLogic.test.ts b/products/early_access_features/frontend/earlyAccessFeatureLogic.test.ts
index f90f0857026a..416297841e82 100644
--- a/products/early_access_features/frontend/earlyAccessFeatureLogic.test.ts
+++ b/products/early_access_features/frontend/earlyAccessFeatureLogic.test.ts
@@ -6,7 +6,7 @@ import { expectLogic } from 'kea-test-utils'
import { lemonToast } from '@posthog/lemon-ui'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { useMocks } from '~/mocks/jest'
diff --git a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
index 70c3b1388f8a..0dbbf760a214 100644
--- a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
+++ b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
@@ -11,8 +11,8 @@ import api from 'lib/api'
import { tryShowMCPHint } from 'lib/components/MCPHint/mcpHintLogic'
import { SetupTaskId, globalSetupLogic } from 'lib/components/ProductSetup'
import { LemonDialog } from 'lib/lemon-ui/LemonDialog'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { identifierToHuman } from 'lib/utils/strings'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
diff --git a/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx b/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
index 2c560a197f22..7bb197523594 100644
--- a/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
+++ b/products/error_tracking/frontend/components/Assignee/assigneeSelectLogic.tsx
@@ -1,9 +1,9 @@
import { MakeLogicType, actions, connect, kea, listeners, path, props, reducers, selectors } from 'kea'
import { createFuse, Fuse } from 'lib/utils/fuseSearch'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { rolesLogic } from 'scenes/settings/organization/Permissions/Roles/rolesLogic'
+import { membersLogic } from '~/models/membersLogic'
import { ErrorTrackingIssue } from '~/queries/schema/schema-general'
import type { OrganizationMemberType, RoleType } from '~/types'
diff --git a/products/error_tracking/frontend/scenes/ErrorTrackingScene/ErrorTrackingScene.tsx b/products/error_tracking/frontend/scenes/ErrorTrackingScene/ErrorTrackingScene.tsx
index 00692c7d993c..d490024e11e7 100644
--- a/products/error_tracking/frontend/scenes/ErrorTrackingScene/ErrorTrackingScene.tsx
+++ b/products/error_tracking/frontend/scenes/ErrorTrackingScene/ErrorTrackingScene.tsx
@@ -10,8 +10,8 @@ import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { IconFeedback } from 'lib/lemon-ui/icons'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneConfigurations } from 'scenes/scenes'
import { Scene, SceneExport } from 'scenes/sceneTypes'
import { Settings } from 'scenes/settings/Settings'
diff --git a/products/feature_flags/frontend/featureFlagCleanupAssessmentLogic.test.ts b/products/feature_flags/frontend/featureFlagCleanupAssessmentLogic.test.ts
index fedf1b92de6b..4d3d6027828b 100644
--- a/products/feature_flags/frontend/featureFlagCleanupAssessmentLogic.test.ts
+++ b/products/feature_flags/frontend/featureFlagCleanupAssessmentLogic.test.ts
@@ -5,11 +5,11 @@ import posthog from 'posthog-js'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { FEATURE_FLAG_CLEANUP_SKILL } from 'scenes/feature-flags/featureFlagAiContext'
import { MAX_SIDE_PANEL_ID } from 'scenes/max/components/PhaiSidePanelChat'
import { maxMocks } from 'scenes/max/testUtils'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
import { useMocks } from '~/mocks/jest'
diff --git a/products/legal_documents/frontend/scenes/LegalDocumentNewScene.tsx b/products/legal_documents/frontend/scenes/LegalDocumentNewScene.tsx
index efe3e18cf799..1cf4a6359072 100644
--- a/products/legal_documents/frontend/scenes/LegalDocumentNewScene.tsx
+++ b/products/legal_documents/frontend/scenes/LegalDocumentNewScene.tsx
@@ -9,8 +9,8 @@ import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { LemonRadio } from 'lib/lemon-ui/LemonRadio'
import { LinkPrimitive } from 'lib/lemon-ui/Link'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene, SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/products/legal_documents/frontend/scenes/LegalDocumentsScene.tsx b/products/legal_documents/frontend/scenes/LegalDocumentsScene.tsx
index 3debccfaa3ba..8f38508d3c71 100644
--- a/products/legal_documents/frontend/scenes/LegalDocumentsScene.tsx
+++ b/products/legal_documents/frontend/scenes/LegalDocumentsScene.tsx
@@ -6,8 +6,8 @@ import { LemonBanner, LemonButton, LemonDialog, LemonTable, LemonTag, Link } fro
import { TZLabel } from 'lib/components/TZLabel'
import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
import { LemonMenu, LemonMenuItems } from 'lib/lemon-ui/LemonMenu'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneConfigurations } from 'scenes/scenes'
import { Scene, SceneExport } from 'scenes/sceneTypes'
import { settingsSectionSceneScope } from 'scenes/settings/settingsSectionScenes'
diff --git a/products/mcp_analytics/frontend/emptyState/MCPAnalyticsSetupActions.tsx b/products/mcp_analytics/frontend/emptyState/MCPAnalyticsSetupActions.tsx
index 8da6f07c378e..9b99dbdcce16 100644
--- a/products/mcp_analytics/frontend/emptyState/MCPAnalyticsSetupActions.tsx
+++ b/products/mcp_analytics/frontend/emptyState/MCPAnalyticsSetupActions.tsx
@@ -6,7 +6,7 @@ import { LemonButton, LemonModal } from '@posthog/lemon-ui'
import { CodeSnippet } from 'lib/components/CodeSnippet/CodeSnippet'
import { productSetupStatusLogic } from 'lib/components/ProductEmptyState/productSetupStatusLogic'
import type { ProductEmptyStateMode } from 'lib/components/ProductEmptyState/types'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { ProductKey } from '~/queries/schema/schema-general'
diff --git a/products/ml_inference/frontend/DecisionPlaygroundScene.tsx b/products/ml_inference/frontend/DecisionPlaygroundScene.tsx
index df28507228da..02ad09eb8e92 100644
--- a/products/ml_inference/frontend/DecisionPlaygroundScene.tsx
+++ b/products/ml_inference/frontend/DecisionPlaygroundScene.tsx
@@ -15,9 +15,9 @@ import {
import { NotFound } from 'lib/components/NotFound'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { CodeEditorResizeable } from 'lib/monaco/CodeEditorResizable'
import { appLogic } from 'scenes/appLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { SceneContent } from '~/layout/scenes/components/SceneContent'
diff --git a/products/posthog_ai/frontend/logics/debugLogsLogic.test.ts b/products/posthog_ai/frontend/logics/debugLogsLogic.test.ts
index 5846ddbcb49d..a59c3ce979fb 100644
--- a/products/posthog_ai/frontend/logics/debugLogsLogic.test.ts
+++ b/products/posthog_ai/frontend/logics/debugLogsLogic.test.ts
@@ -1,6 +1,6 @@
import { MOCK_DEFAULT_USER } from 'lib/api.mock'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { initKeaTests } from '~/test/init'
diff --git a/products/posthog_ai/frontend/logics/debugLogsLogic.ts b/products/posthog_ai/frontend/logics/debugLogsLogic.ts
index eb32d23f90ba..663ba06c1f61 100644
--- a/products/posthog_ai/frontend/logics/debugLogsLogic.ts
+++ b/products/posthog_ai/frontend/logics/debugLogsLogic.ts
@@ -1,6 +1,6 @@
import { MakeLogicType, actions, connect, kea, path, reducers, selectors } from 'kea'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import type { UserType } from '../../../../frontend/src/types'
diff --git a/products/posthog_ai/frontend/logics/runStreamLogic.ts b/products/posthog_ai/frontend/logics/runStreamLogic.ts
index d027d5ea882e..aa2b9d423560 100644
--- a/products/posthog_ai/frontend/logics/runStreamLogic.ts
+++ b/products/posthog_ai/frontend/logics/runStreamLogic.ts
@@ -20,8 +20,8 @@ import type { AgentConversationEvent } from '@posthog/agent-contracts/agent-conv
import api from 'lib/api'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { uuid } from 'lib/utils/dom'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { projectLogic } from 'scenes/projectLogic'
import { userLogic } from 'scenes/userLogic'
diff --git a/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts b/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
index 8fc9a0097f5c..fe581730d781 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelPersonsModalLogic.test.ts
@@ -1,7 +1,7 @@
import { router } from 'kea-router'
import { expectLogic } from 'kea-test-utils'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { openPersonsModal } from 'scenes/trends/persons-modal/PersonsModal'
import { urls } from 'scenes/urls'
diff --git a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelToggles.tsx b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelToggles.tsx
index 24cde2257a82..5cc4a19cabfc 100644
--- a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelToggles.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelToggles.tsx
@@ -1,10 +1,10 @@
import { useActions, useValues } from 'kea'
import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { insightDataLogic } from 'scenes/insights/insightDataLogic'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { userLogic } from 'scenes/userLogic'
import { ScenePanelActionsSection } from '~/layout/scenes/SceneLayout'
diff --git a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
index 337410332bf8..0f59cd77a812 100644
--- a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
@@ -30,12 +30,12 @@ import { SceneTagsCombobox } from 'lib/components/Scenes/SceneTagsCombobox'
import { SceneActivityIndicator } from 'lib/components/Scenes/SceneUpdateActivityInfo'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { getAccessControlDisabledReason } from 'lib/utils/accessControlUtils'
import { insightDataLogic } from 'scenes/insights/insightDataLogic'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
import { NotebookNodeType } from 'scenes/notebooks/types'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { interProjectCopyLogic } from 'scenes/resource-transfer/interProjectCopyLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
diff --git a/products/signals/frontend/inbox/SignalGraphTab.tsx b/products/signals/frontend/inbox/SignalGraphTab.tsx
index a9f5ae754501..72c8f7769cb6 100644
--- a/products/signals/frontend/inbox/SignalGraphTab.tsx
+++ b/products/signals/frontend/inbox/SignalGraphTab.tsx
@@ -2,6 +2,7 @@ import { useValues } from 'kea'
import { useMemo, useRef, useState } from 'react'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { DetailPanel } from 'scenes/debug/signals/DetailPanel'
import { EdgeTooltip } from 'scenes/debug/signals/EdgeTooltip'
import { buildEdges } from 'scenes/debug/signals/helpers'
@@ -9,7 +10,6 @@ import { SignalGraph } from 'scenes/debug/signals/SignalGraph'
import { SimulationControls } from 'scenes/debug/signals/SimulationControls'
import { DEFAULT_CONFIG, GraphEdge, SignalNode, SimConfig } from 'scenes/debug/signals/types'
import { useD3ForceSimulation } from 'scenes/debug/signals/useD3ForceSimulation'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
const STORAGE_KEY = 'inbox-signal-graph-physics'
diff --git a/products/subscriptions/frontend/components/Subscriptions/SubscriptionWizard.tsx b/products/subscriptions/frontend/components/Subscriptions/SubscriptionWizard.tsx
index 34399a2f6d15..b725b256ee15 100644
--- a/products/subscriptions/frontend/components/Subscriptions/SubscriptionWizard.tsx
+++ b/products/subscriptions/frontend/components/Subscriptions/SubscriptionWizard.tsx
@@ -28,12 +28,12 @@ import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch'
import { preflightLogic } from 'lib/logic/preflightLogic'
import { cn } from 'lib/utils/css-classes'
import { maxGlobalLogic } from 'scenes/max/maxGlobalLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { FEATURE_FLAGS } from '~/lib/constants'
+import { membersLogic } from '~/models/membersLogic'
import { DashboardType, InsightShortId, SubscriptionResourceTypes, SubscriptionType } from '~/types'
import { AiPromptFields, AiPromptSubscriptionIntroduction } from './AiPromptFields'
diff --git a/products/subscriptions/frontend/components/Subscriptions/views/EditSubscription.tsx b/products/subscriptions/frontend/components/Subscriptions/views/EditSubscription.tsx
index 79e0b6a818ca..ca5a2e5b5f2a 100644
--- a/products/subscriptions/frontend/components/Subscriptions/views/EditSubscription.tsx
+++ b/products/subscriptions/frontend/components/Subscriptions/views/EditSubscription.tsx
@@ -29,12 +29,12 @@ import { LemonSwitch } from 'lib/lemon-ui/LemonSwitch'
import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
import { preflightLogic } from 'lib/logic/preflightLogic'
import { maxGlobalLogic } from 'scenes/max/maxGlobalLogic'
-import { membersLogic } from 'scenes/organization/membersLogic'
import { organizationLogic } from 'scenes/organizationLogic'
import { AIConsentPopoverWrapper } from 'scenes/settings/organization/AIConsentPopoverWrapper'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
+import { membersLogic } from '~/models/membersLogic'
import { SubscriptionFreeTierLimit } from '~/queries/schema/schema-general'
import { AvailableFeature, DashboardType, InsightShortId, SubscriptionResourceTypes } from '~/types'
diff --git a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.test.ts b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.test.ts
index ff6ce0628cc3..b99b9ad8eb16 100644
--- a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.test.ts
+++ b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.test.ts
@@ -5,8 +5,8 @@ import { expectLogic } from 'kea-test-utils'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneLogic } from 'scenes/sceneLogic'
import { Scene } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
index 94432dd18d5f..6e0b36fdad82 100644
--- a/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
+++ b/products/subscriptions/frontend/scenes/subscriptionsSceneLogic.tsx
@@ -6,11 +6,11 @@ import { Sorting } from '@posthog/lemon-ui'
import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic, type FeatureFlagsSet } from 'lib/logic/featureFlagLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { trackedActionToUrl } from 'lib/logic/scenes/trackedActionToUrl'
import { getCurrentTeamId } from 'lib/utils/getAppContext'
import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { sceneConfigurations } from 'scenes/scenes'
import { Scene } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
diff --git a/products/tasks/frontend/spaces/SpaceMembers.tsx b/products/tasks/frontend/spaces/SpaceMembers.tsx
index b0cd417d3506..9b2bb73f3def 100644
--- a/products/tasks/frontend/spaces/SpaceMembers.tsx
+++ b/products/tasks/frontend/spaces/SpaceMembers.tsx
@@ -26,7 +26,8 @@ import {
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+
+import { membersLogic } from '~/models/membersLogic'
import { spaceSceneLogic } from './spaceSceneLogic'
import { SpaceSettingsSection } from './SpaceSettingsSection'
diff --git a/products/workflows/frontend/Broadcasts/steps/BroadcastScheduleStep.tsx b/products/workflows/frontend/Broadcasts/steps/BroadcastScheduleStep.tsx
index 7e039c490233..aba1b032fdb8 100644
--- a/products/workflows/frontend/Broadcasts/steps/BroadcastScheduleStep.tsx
+++ b/products/workflows/frontend/Broadcasts/steps/BroadcastScheduleStep.tsx
@@ -5,8 +5,8 @@ import { LemonCalendarSelectInput, LemonSearchableSelect } from '@posthog/lemon-
import { dayjs } from 'lib/dayjs'
import { LemonRadio } from 'lib/lemon-ui/LemonRadio'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { SendDayPicker } from '../../SendCalendar/SendDayPicker'
import { EmailSendingRateLimitPicker } from '../../Workflows/hogflows/steps/components/EmailSendingRateLimitPicker'
diff --git a/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.test.ts b/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.test.ts
index ebccee3653d6..fb28e75481e5 100644
--- a/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.test.ts
+++ b/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.test.ts
@@ -3,8 +3,8 @@ import { MOCK_DEFAULT_ORGANIZATION } from 'lib/api.mock'
import { expectLogic } from 'kea-test-utils'
import { integrationsLogic } from 'lib/integrations/integrationsLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { useMocks } from '~/mocks/jest'
import { initKeaTests } from '~/test/init'
diff --git a/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.ts b/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.ts
index a285de2ad513..d39358d59e22 100644
--- a/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.ts
+++ b/products/workflows/frontend/Channels/EmailDomain/emailDomainWizardLogic.ts
@@ -4,8 +4,8 @@ import posthog from 'posthog-js'
import api, { ApiError } from 'lib/api'
import { integrationsLogic } from 'lib/integrations/integrationsLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { organizationLogic } from 'scenes/organizationLogic'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { Scene } from 'scenes/sceneTypes'
import { teamLogic } from 'scenes/teamLogic'
import { userLogic } from 'scenes/userLogic'
diff --git a/products/workflows/frontend/OptOuts/customerIOImportLogic.ts b/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
index e5128b559461..0a31d17c2c12 100644
--- a/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
+++ b/products/workflows/frontend/OptOuts/customerIOImportLogic.ts
@@ -5,7 +5,7 @@ import { loaders } from 'kea-loaders'
import { ApiRequest, getCookie } from 'lib/api'
import { lemonToast } from 'lib/lemon-ui/LemonToast'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import {
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/StepDelay.tsx b/products/workflows/frontend/Workflows/hogflows/steps/StepDelay.tsx
index c2a16ee9add6..6bf5a222a39d 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/StepDelay.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/steps/StepDelay.tsx
@@ -6,8 +6,8 @@ import { LemonInputSelect, LemonSelect, LemonSwitch } from '@posthog/lemon-ui'
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { TaxonomicStringPopover } from 'lib/components/TaxonomicPopover/TaxonomicPopover'
import { LemonField } from 'lib/lemon-ui/LemonField'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { workflowLogic } from '../../workflowLogic'
import { HogFlowAction } from '../types'
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/StepWaitUntilTimeWindow.tsx b/products/workflows/frontend/Workflows/hogflows/steps/StepWaitUntilTimeWindow.tsx
index aa9325af3bbf..64eb132c5717 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/StepWaitUntilTimeWindow.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/steps/StepWaitUntilTimeWindow.tsx
@@ -3,8 +3,8 @@ import { useActions, useValues } from 'kea'
import { LemonDivider, LemonInputSelect, LemonLabel, LemonSelect, LemonSwitch } from '@posthog/lemon-ui'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { teamLogic } from 'scenes/teamLogic'
import { WeekdayType } from '~/types'
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/components/CustomerTaskWorkflowReferenceInput.tsx b/products/workflows/frontend/Workflows/hogflows/steps/components/CustomerTaskWorkflowReferenceInput.tsx
index a6f65d3a3a4d..96e8e9430ce1 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/components/CustomerTaskWorkflowReferenceInput.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/steps/components/CustomerTaskWorkflowReferenceInput.tsx
@@ -7,8 +7,8 @@ import { MemberSelect } from 'lib/components/MemberSelect'
import { LemonField } from 'lib/lemon-ui/LemonField'
import { CodeEditorInline } from 'lib/monaco/CodeEditorInline'
import { fullName } from 'lib/utils/strings'
-import { membersLogic } from 'scenes/organization/membersLogic'
+import { membersLogic } from '~/models/membersLogic'
import { CyclotronJobInputSchemaType, CyclotronJobInputType, CyclotronJobInvocationGlobalsWithInputs } from '~/types'
import { customerTaskWorkflowAccountLogic } from './customerTaskWorkflowAccountLogic'
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/components/RecurringSchedulePicker.tsx b/products/workflows/frontend/Workflows/hogflows/steps/components/RecurringSchedulePicker.tsx
index 2dc0fa7a6b37..1094e5960b93 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/components/RecurringSchedulePicker.tsx
+++ b/products/workflows/frontend/Workflows/hogflows/steps/components/RecurringSchedulePicker.tsx
@@ -12,8 +12,8 @@ import {
} from '@posthog/lemon-ui'
import { dayjs } from 'lib/dayjs'
+import { preflightLogic } from 'lib/logic/preflightLogic'
import { timeZoneLabel } from 'lib/utils/timezones'
-import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
import { OccurrencesList } from './OccurrencesList'
import {