extends Component<
P,
diff --git a/app/client/src/components/formControls/CheckboxControl.tsx b/app/client/src/components/formControls/CheckboxControl.tsx
index c30dadc8370d..ece166491271 100644
--- a/app/client/src/components/formControls/CheckboxControl.tsx
+++ b/app/client/src/components/formControls/CheckboxControl.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import type { CheckboxProps } from "design-system";
-import { Checkbox } from "design-system";
+import type { CheckboxProps } from "@appsmith/ads";
+import { Checkbox } from "@appsmith/ads";
import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index 0e28e70eae1b..18e02ebc21cf 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -7,7 +7,7 @@ import { get, isEmpty, isNil } from "lodash";
import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import { Field } from "redux-form";
import { connect } from "react-redux";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
import { getDynamicFetchedValues } from "selectors/formSelectors";
import { change, getFormValues } from "redux-form";
import {
@@ -16,8 +16,8 @@ import {
MATCH_ACTION_CONFIG_PROPERTY,
} from "workers/Evaluation/formEval";
import type { Action } from "entities/Action";
-import type { SelectOptionProps } from "design-system";
-import { Icon, Option, Select } from "design-system";
+import type { SelectOptionProps } from "@appsmith/ads";
+import { Icon, Option, Select } from "@appsmith/ads";
const DropdownSelect = styled.div<{
width: string;
diff --git a/app/client/src/components/formControls/DynamicInputTextControl.tsx b/app/client/src/components/formControls/DynamicInputTextControl.tsx
index b2ccd0a9c4c1..874a8c9e9e32 100644
--- a/app/client/src/components/formControls/DynamicInputTextControl.tsx
+++ b/app/client/src/components/formControls/DynamicInputTextControl.tsx
@@ -3,9 +3,9 @@ import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
import { formValueSelector } from "redux-form";
-import { QUERY_EDITOR_FORM_NAME } from "@appsmith/constants/forms";
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
import { connect } from "react-redux";
import { actionPathFromName } from "components/formControls/utils";
import {
diff --git a/app/client/src/components/formControls/DynamicTextFieldControl.tsx b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
index 7b02b992d0ba..f4bbbf696ff5 100644
--- a/app/client/src/components/formControls/DynamicTextFieldControl.tsx
+++ b/app/client/src/components/formControls/DynamicTextFieldControl.tsx
@@ -10,17 +10,17 @@ import {
EditorModes,
TabBehaviour,
} from "components/editorComponents/CodeEditor/EditorConfig";
-import { QUERY_EDITOR_FORM_NAME } from "@appsmith/constants/forms";
-import type { AppState } from "@appsmith/reducers";
+import { QUERY_EDITOR_FORM_NAME } from "ee/constants/forms";
+import type { AppState } from "ee/reducers";
import styled from "styled-components";
import {
getPluginResponseTypes,
getPluginNameFromId,
-} from "@appsmith/selectors/entitiesSelector";
+} from "ee/selectors/entitiesSelector";
import { actionPathFromName } from "components/formControls/utils";
import type { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
import { getSqlEditorModeFromPluginName } from "components/editorComponents/CodeEditor/sql/config";
-import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
+import { selectFeatureFlags } from "ee/selectors/featureFlagsSelectors";
const Wrapper = styled.div<{ fullWidth: boolean }>`
min-width: 380px;
diff --git a/app/client/src/components/formControls/FieldArrayControl.tsx b/app/client/src/components/formControls/FieldArrayControl.tsx
index 622711ae5b42..14a62f9f3e18 100644
--- a/app/client/src/components/formControls/FieldArrayControl.tsx
+++ b/app/client/src/components/formControls/FieldArrayControl.tsx
@@ -3,7 +3,7 @@ import FormControl from "pages/Editor/FormControl";
import styled from "styled-components";
import { FieldArray } from "redux-form";
import type { ControlProps } from "./BaseControl";
-import { Button } from "design-system";
+import { Button } from "@appsmith/ads";
const CenteredIconButton = styled(Button)<{
alignSelf?: string;
diff --git a/app/client/src/components/formControls/FilePickerControl.tsx b/app/client/src/components/formControls/FilePickerControl.tsx
index b1aa2ce25fa0..f37ac80ce1b9 100644
--- a/app/client/src/components/formControls/FilePickerControl.tsx
+++ b/app/client/src/components/formControls/FilePickerControl.tsx
@@ -4,13 +4,13 @@ import styled from "styled-components";
import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
-import type { SetProgress } from "design-system-old";
-import { FilePickerV2, FileType } from "design-system-old";
+import type { SetProgress } from "@appsmith/ads-old";
+import { FilePickerV2, FileType } from "@appsmith/ads-old";
import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import { Field } from "redux-form";
import { useEffect, useCallback } from "react";
import { replayHighlightClass } from "globalStyles/portals";
-import { Button, Modal, ModalBody, ModalContent } from "design-system";
+import { Button, Modal, ModalBody, ModalContent } from "@appsmith/ads";
const StyledDiv = styled.div`
flex: 1;
diff --git a/app/client/src/components/formControls/FormTemplateControl.tsx b/app/client/src/components/formControls/FormTemplateControl.tsx
index d870c121013b..1c8540c08c7a 100644
--- a/app/client/src/components/formControls/FormTemplateControl.tsx
+++ b/app/client/src/components/formControls/FormTemplateControl.tsx
@@ -3,12 +3,12 @@ import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
import styled from "styled-components";
-import { Button, Flex } from "design-system";
-import type { ButtonProps } from "design-system";
+import { Button, Flex } from "@appsmith/ads";
+import type { ButtonProps } from "@appsmith/ads";
import { change, getFormValues } from "redux-form";
import { connect } from "react-redux";
import { get, omit } from "lodash";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
import type { Action } from "entities/Action";
const StyledButton = styled((props: ButtonProps & { isActive: boolean }) => (
diff --git a/app/client/src/components/formControls/InputNumberControl.tsx b/app/client/src/components/formControls/InputNumberControl.tsx
index ef8e403fef9d..e77b2c9167fb 100644
--- a/app/client/src/components/formControls/InputNumberControl.tsx
+++ b/app/client/src/components/formControls/InputNumberControl.tsx
@@ -3,7 +3,7 @@ import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
import NumberField from "components/editorComponents/form/fields/NumberField";
-import { Classes, Text, TextType } from "design-system-old";
+import { Classes, Text, TextType } from "@appsmith/ads-old";
import styled from "styled-components";
const FormGroup = styled.div`
diff --git a/app/client/src/components/formControls/InputTextControl.tsx b/app/client/src/components/formControls/InputTextControl.tsx
index 3077f24f9d37..9443cd4a397d 100644
--- a/app/client/src/components/formControls/InputTextControl.tsx
+++ b/app/client/src/components/formControls/InputTextControl.tsx
@@ -2,14 +2,14 @@ import React from "react";
import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
import styled from "styled-components";
import type { InputType } from "components/constants";
-import type { InputTypes as DSInputType } from "design-system";
+import type { InputTypes as DSInputType } from "@appsmith/ads";
import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form";
import { Field, formValueSelector } from "redux-form";
import { connect } from "react-redux";
-import { Input } from "design-system";
+import { Input } from "@appsmith/ads";
export const StyledInfo = styled.span`
font-weight: normal;
diff --git a/app/client/src/components/formControls/KeyValueArrayControl.tsx b/app/client/src/components/formControls/KeyValueArrayControl.tsx
index f03fb7b50367..3d0969572ebd 100644
--- a/app/client/src/components/formControls/KeyValueArrayControl.tsx
+++ b/app/client/src/components/formControls/KeyValueArrayControl.tsx
@@ -10,10 +10,10 @@ import type { ControlProps, ControlData } from "./BaseControl";
import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField";
-import type { InputProps } from "design-system";
+import type { InputProps } from "@appsmith/ads";
import { setDefaultKeyValPairFlag } from "actions/datasourceActions";
import { useDispatch } from "react-redux";
-import { Button, Icon, Input, Text, Tooltip } from "design-system";
+import { Button, Icon, Input, Text, Tooltip } from "@appsmith/ads";
export interface KeyValueArrayControlProps extends ControlProps {
name: string;
label: string;
diff --git a/app/client/src/components/formControls/MultiFilePickerControl.tsx b/app/client/src/components/formControls/MultiFilePickerControl.tsx
index b9982d2d4e91..ef3ea1ae09d9 100644
--- a/app/client/src/components/formControls/MultiFilePickerControl.tsx
+++ b/app/client/src/components/formControls/MultiFilePickerControl.tsx
@@ -6,8 +6,8 @@ import BaseControl from "./BaseControl";
import type { ControlType } from "constants/PropertyControlConstants";
import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import { Field, getFormValues } from "redux-form";
-import { Button, Tag, Text, toast } from "design-system";
-import type { AppState } from "@appsmith/reducers";
+import { Button, Tag, Text, toast } from "@appsmith/ads";
+import type { AppState } from "ee/reducers";
import type { Datasource } from "entities/Datasource";
import type { Action } from "entities/Action";
import { connect } from "react-redux";
@@ -15,9 +15,9 @@ import PluginsApi from "api/PluginApi";
import type { Plugin } from "api/PluginApi";
import { get, isArray } from "lodash";
import { formatFileSize } from "./utils";
-import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
-import { getPlugin } from "@appsmith/selectors/entitiesSelector";
-import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
+import { getPlugin } from "ee/selectors/entitiesSelector";
+import AnalyticsUtil from "ee/utils/AnalyticsUtil";
const HiddenFileInput = styled.input`
visibility: hidden;
diff --git a/app/client/src/components/formControls/SegmentedControl.tsx b/app/client/src/components/formControls/SegmentedControl.tsx
index d92c8f443772..e9c711a32faf 100644
--- a/app/client/src/components/formControls/SegmentedControl.tsx
+++ b/app/client/src/components/formControls/SegmentedControl.tsx
@@ -7,12 +7,12 @@ import { isNil } from "lodash";
import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
import { Field } from "redux-form";
import { connect } from "react-redux";
-import type { AppState } from "@appsmith/reducers";
+import type { AppState } from "ee/reducers";
import { getDynamicFetchedValues } from "selectors/formSelectors";
import { change, getFormValues } from "redux-form";
import type { Action } from "entities/Action";
-import type { SelectOptionProps } from "design-system";
-import { SegmentedControl } from "design-system";
+import type { SelectOptionProps } from "@appsmith/ads";
+import { SegmentedControl } from "@appsmith/ads";
const SegmentedControlWrapper = styled.div<{
width: string;
diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx
index 32e13cb46467..5f92252b9056 100644
--- a/app/client/src/components/formControls/SortingControl.tsx
+++ b/app/client/src/components/formControls/SortingControl.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useRef } from "react";
import { useSelector } from "react-redux";
import FormControl from "pages/Editor/FormControl";
-import { Classes } from "design-system-old";
+import { Classes } from "@appsmith/ads-old";
import styled from "styled-components";
import { FieldArray, getFormValues } from "redux-form";
import type { ControlProps } from "./BaseControl";
@@ -9,7 +9,7 @@ import { getBindingOrConfigPathsForSortingControl } from "entities/Action/action
import { SortingSubComponent } from "./utils";
import { get, isArray } from "lodash";
import useResponsiveBreakpoints from "utils/hooks/useResponsiveBreakpoints";
-import { Button } from "design-system";
+import { Button } from "@appsmith/ads";
// sorting's order dropdown values
enum OrderDropDownValues {
diff --git a/app/client/src/components/formControls/SwitchControl.tsx b/app/client/src/components/formControls/SwitchControl.tsx
index c2eb8562bd44..c7e5c6f38b9a 100644
--- a/app/client/src/components/formControls/SwitchControl.tsx
+++ b/app/client/src/components/formControls/SwitchControl.tsx
@@ -1,7 +1,7 @@
import React from "react";
import type { ControlProps } from "./BaseControl";
import BaseControl from "./BaseControl";
-import { Switch } from "design-system";
+import { Switch } from "@appsmith/ads";
import type { ControlType } from "constants/PropertyControlConstants";
import type { WrappedFieldProps } from "redux-form";
import { Field } from "redux-form";
diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx
index 2abc877af169..cb5396499237 100644
--- a/app/client/src/components/formControls/WhereClauseControl.tsx
+++ b/app/client/src/components/formControls/WhereClauseControl.tsx
@@ -8,7 +8,7 @@ import { useSelector } from "react-redux";
import { getBindingOrConfigPathsForWhereClauseControl } from "entities/Action/actionProperties";
import { WhereClauseSubComponent } from "./utils";
import useResponsiveBreakpoints from "utils/hooks/useResponsiveBreakpoints";
-import { Button, Tooltip } from "design-system";
+import { Button, Tooltip } from "@appsmith/ads";
//Dropdwidth and Icon have fixed widths
const DropdownWidth = 82; //pixel value
diff --git a/app/client/src/components/formControls/utils.test.ts b/app/client/src/components/formControls/utils.test.ts
index 2ede9d37875d..9fab21a8c922 100644
--- a/app/client/src/components/formControls/utils.test.ts
+++ b/app/client/src/components/formControls/utils.test.ts
@@ -15,7 +15,7 @@ import {
import type { HiddenType } from "./BaseControl";
import { set } from "lodash";
import { isValidFormConfig } from "reducers/evaluationReducers/formEvaluationReducer";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
describe("isHidden test", () => {
it("Test for isHidden true", () => {
diff --git a/app/client/src/components/formControls/utils.ts b/app/client/src/components/formControls/utils.ts
index 18cd047aec97..465337ec03ff 100644
--- a/app/client/src/components/formControls/utils.ts
+++ b/app/client/src/components/formControls/utils.ts
@@ -11,14 +11,11 @@ import { diff } from "deep-diff";
import { MongoDefaultActionConfig } from "constants/DatasourceEditorConstants";
import type { Action } from "@sentry/react/dist/types";
import { klona } from "klona/full";
-import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+import type { FeatureFlags } from "ee/entities/FeatureFlag";
import _ from "lodash";
import { getType, Types } from "utils/TypeHelpers";
-import {
- FIELD_REQUIRED_ERROR,
- createMessage,
-} from "@appsmith/constants/messages";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import { FIELD_REQUIRED_ERROR, createMessage } from "ee/constants/messages";
+import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
import { InputTypes } from "components/constants";
// This function checks if the form is dirty
diff --git a/app/client/src/components/propertyControls/ActionSelectorControl.tsx b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
index 4010a0c834e0..4fe8ab6b17ce 100644
--- a/app/client/src/components/propertyControls/ActionSelectorControl.tsx
+++ b/app/client/src/components/propertyControls/ActionSelectorControl.tsx
@@ -20,18 +20,18 @@ import {
getJSModuleInstancesData,
getModuleInstances,
getPlugins,
-} from "@appsmith/selectors/entitiesSelector";
+} from "ee/selectors/entitiesSelector";
import store from "store";
import { getCurrentPageId } from "selectors/editorSelectors";
import { getApiQueriesAndJSActionOptionsWithChildren } from "components/editorComponents/ActionCreator/helpers";
-import { selectEvaluationVersion } from "@appsmith/selectors/applicationSelectors";
+import { selectEvaluationVersion } from "ee/selectors/applicationSelectors";
import type {
ModuleInstance,
ModuleInstanceDataState,
-} from "@appsmith/constants/ModuleInstanceConstants";
-import { MODULE_TYPE } from "@appsmith/constants/ModuleConstants";
+} from "ee/constants/ModuleInstanceConstants";
+import { MODULE_TYPE } from "ee/constants/ModuleConstants";
import type { JSAction } from "entities/JSCollection";
-import { getAllModules } from "@appsmith/selectors/modulesSelector";
+import { getAllModules } from "ee/selectors/modulesSelector";
class ActionSelectorControl extends BaseControl