diff --git a/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts b/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts
index 66c93b8..b3d0f23 100644
--- a/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts
+++ b/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts
@@ -1,4 +1,4 @@
-import { displayTextDataLocationKey } from "../../form/controls/control.array";
+import { displayTextDataLocationKey } from "../../form/controls/type/control.array";
 
 export default {
     $schema: "http://json-schema.org/schema#",
diff --git a/packages/design-to-code-react/src/form/controls/utilities/form.tsx b/packages/design-to-code-react/src/form/controls/utilities/form.tsx
index 368349b..5fe783d 100644
--- a/packages/design-to-code-react/src/form/controls/utilities/form.tsx
+++ b/packages/design-to-code-react/src/form/controls/utilities/form.tsx
@@ -8,14 +8,12 @@ import {
     CategoryState,
     SectionControlProps,
     SectionControlState,
-} from "../control.section.props";
-import { cloneDeep, get, isEmpty, mergeWith, omit, set, unset } from "lodash-es";
+} from "../type/control.section.props";
+import { get, omit } from "lodash-es";
 import {
     CombiningKeyword,
     DataDictionary,
     getDataFromSchema,
-    MessageSystem,
-    MessageSystemType,
     normalizeDataLocationToDotNotation,
     ValidationError,
 } from "design-to-code";