diff --git a/packages/core/src/components/ModalNew/Modal/Modal.module.scss b/packages/core/src/components/Modal/Modal/Modal.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/Modal.module.scss
rename to packages/core/src/components/Modal/Modal/Modal.module.scss
diff --git a/packages/core/src/components/ModalNew/Modal/Modal.tsx b/packages/core/src/components/Modal/Modal/Modal.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/Modal.tsx
rename to packages/core/src/components/Modal/Modal/Modal.tsx
diff --git a/packages/core/src/components/ModalNew/Modal/Modal.types.tsx b/packages/core/src/components/Modal/Modal/Modal.types.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/Modal.types.tsx
rename to packages/core/src/components/Modal/Modal/Modal.types.tsx
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/Modal.mdx b/packages/core/src/components/Modal/Modal/__stories__/Modal.mdx
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/Modal.mdx
rename to packages/core/src/components/Modal/Modal/__stories__/Modal.mdx
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/Modal.stories.helpers.tsx b/packages/core/src/components/Modal/Modal/__stories__/Modal.stories.helpers.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/Modal.stories.helpers.tsx
rename to packages/core/src/components/Modal/Modal/__stories__/Modal.stories.helpers.tsx
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/Modal.stories.module.scss b/packages/core/src/components/Modal/Modal/__stories__/Modal.stories.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/Modal.stories.module.scss
rename to packages/core/src/components/Modal/Modal/__stories__/Modal.stories.module.scss
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/backdrop-do.png b/packages/core/src/components/Modal/Modal/__stories__/assets/backdrop-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/backdrop-do.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/backdrop-do.png
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/backdrop-dont.png b/packages/core/src/components/Modal/Modal/__stories__/assets/backdrop-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/backdrop-dont.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/backdrop-dont.png
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/cta-do.png b/packages/core/src/components/Modal/Modal/__stories__/assets/cta-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/cta-do.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/cta-do.png
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/cta-dont.png b/packages/core/src/components/Modal/Modal/__stories__/assets/cta-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/cta-dont.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/cta-dont.png
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/loading-do.png b/packages/core/src/components/Modal/Modal/__stories__/assets/loading-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/loading-do.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/loading-do.png
diff --git a/packages/core/src/components/ModalNew/Modal/__stories__/assets/loading-dont.png b/packages/core/src/components/Modal/Modal/__stories__/assets/loading-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__stories__/assets/loading-dont.png
rename to packages/core/src/components/Modal/Modal/__stories__/assets/loading-dont.png
diff --git a/packages/core/src/components/ModalNew/Modal/__tests__/Modal.test.tsx b/packages/core/src/components/Modal/Modal/__tests__/Modal.test.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/Modal/__tests__/Modal.test.tsx
rename to packages/core/src/components/Modal/Modal/__tests__/Modal.test.tsx
diff --git a/packages/core/src/components/ModalNew/ModalContent/ModalContent.tsx b/packages/core/src/components/Modal/ModalContent/ModalContent.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalContent/ModalContent.tsx
rename to packages/core/src/components/Modal/ModalContent/ModalContent.tsx
diff --git a/packages/core/src/components/ModalNew/ModalContent/ModalContent.types.ts b/packages/core/src/components/Modal/ModalContent/ModalContent.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalContent/ModalContent.types.ts
rename to packages/core/src/components/Modal/ModalContent/ModalContent.types.ts
diff --git a/packages/core/src/components/ModalNew/ModalHeader/ModalHeader.module.scss b/packages/core/src/components/Modal/ModalHeader/ModalHeader.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalHeader/ModalHeader.module.scss
rename to packages/core/src/components/Modal/ModalHeader/ModalHeader.module.scss
diff --git a/packages/core/src/components/ModalNew/ModalHeader/ModalHeader.tsx b/packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalHeader/ModalHeader.tsx
rename to packages/core/src/components/Modal/ModalHeader/ModalHeader.tsx
diff --git a/packages/core/src/components/ModalNew/ModalHeader/ModalHeader.types.ts b/packages/core/src/components/Modal/ModalHeader/ModalHeader.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalHeader/ModalHeader.types.ts
rename to packages/core/src/components/Modal/ModalHeader/ModalHeader.types.ts
diff --git a/packages/core/src/components/ModalNew/ModalHeader/__tests__/ModalHeader.test.tsx b/packages/core/src/components/Modal/ModalHeader/__tests__/ModalHeader.test.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalHeader/__tests__/ModalHeader.test.tsx
rename to packages/core/src/components/Modal/ModalHeader/__tests__/ModalHeader.test.tsx
diff --git a/packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.module.scss b/packages/core/src/components/Modal/ModalTopActions/ModalTopActions.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.module.scss
rename to packages/core/src/components/Modal/ModalTopActions/ModalTopActions.module.scss
diff --git a/packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.tsx b/packages/core/src/components/Modal/ModalTopActions/ModalTopActions.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.tsx
rename to packages/core/src/components/Modal/ModalTopActions/ModalTopActions.tsx
diff --git a/packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.types.ts b/packages/core/src/components/Modal/ModalTopActions/ModalTopActions.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalTopActions/ModalTopActions.types.ts
rename to packages/core/src/components/Modal/ModalTopActions/ModalTopActions.types.ts
diff --git a/packages/core/src/components/ModalNew/ModalTopActions/__tests__/ModalTopActions.test.tsx b/packages/core/src/components/Modal/ModalTopActions/__tests__/ModalTopActions.test.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/ModalTopActions/__tests__/ModalTopActions.test.tsx
rename to packages/core/src/components/Modal/ModalTopActions/__tests__/ModalTopActions.test.tsx
diff --git a/packages/core/src/components/ModalNew/context/ModalContext.tsx b/packages/core/src/components/Modal/context/ModalContext.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/context/ModalContext.tsx
rename to packages/core/src/components/Modal/context/ModalContext.tsx
diff --git a/packages/core/src/components/ModalNew/context/ModalContext.types.ts b/packages/core/src/components/Modal/context/ModalContext.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/context/ModalContext.types.ts
rename to packages/core/src/components/Modal/context/ModalContext.types.ts
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.module.scss b/packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.module.scss
rename to packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.module.scss
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.tsx b/packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.tsx
rename to packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.tsx
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.types.ts b/packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooter/ModalFooter.types.ts
rename to packages/core/src/components/Modal/footers/ModalFooter/ModalFooter.types.ts
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.module.scss b/packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.module.scss
rename to packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.module.scss
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.tsx b/packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.tsx
rename to packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.tsx
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.types.ts b/packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterBase/ModalFooterBase.types.ts
rename to packages/core/src/components/Modal/footers/ModalFooterBase/ModalFooterBase.types.ts
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterBase/__tests__/ModalFooterBase.test.tsx b/packages/core/src/components/Modal/footers/ModalFooterBase/__tests__/ModalFooterBase.test.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterBase/__tests__/ModalFooterBase.test.tsx
rename to packages/core/src/components/Modal/footers/ModalFooterBase/__tests__/ModalFooterBase.test.tsx
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.module.scss b/packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.module.scss
rename to packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.module.scss
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.tsx b/packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.tsx
rename to packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.tsx
diff --git a/packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.types.ts b/packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/footers/ModalFooterWizard/ModalFooterWizard.types.ts
rename to packages/core/src/components/Modal/footers/ModalFooterWizard/ModalFooterWizard.types.ts
diff --git a/packages/core/src/components/ModalNew/hooks/usePortalTarget/usePortalTarget.ts b/packages/core/src/components/Modal/hooks/usePortalTarget/usePortalTarget.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/hooks/usePortalTarget/usePortalTarget.ts
rename to packages/core/src/components/Modal/hooks/usePortalTarget/usePortalTarget.ts
diff --git a/packages/core/src/components/ModalNew/hooks/usePortalTarget/usePortalTarget.types.ts b/packages/core/src/components/Modal/hooks/usePortalTarget/usePortalTarget.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/hooks/usePortalTarget/usePortalTarget.types.ts
rename to packages/core/src/components/Modal/hooks/usePortalTarget/usePortalTarget.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.module.scss b/packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.module.scss
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.tsx b/packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.tsx
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.types.ts b/packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/ModalBasicLayout.types.ts
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/ModalBasicLayout.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.mdx b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.mdx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.mdx
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.mdx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.helpers.tsx b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.helpers.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.helpers.tsx
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.helpers.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.tsx b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.tsx
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayout.stories.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent.tsx b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent.tsx
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/action-do.png b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/action-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/action-do.png
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/action-do.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/action-dont.png b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/action-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/action-dont.png
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/action-dont.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/related-component.png b/packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/related-component.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalBasicLayout/__stories__/assets/related-component.png
rename to packages/core/src/components/Modal/layouts/ModalBasicLayout/__stories__/assets/related-component.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalFooterShadow.module.scss b/packages/core/src/components/Modal/layouts/ModalFooterShadow.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalFooterShadow.module.scss
rename to packages/core/src/components/Modal/layouts/ModalFooterShadow.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalFooterShadow.tsx b/packages/core/src/components/Modal/layouts/ModalFooterShadow.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalFooterShadow.tsx
rename to packages/core/src/components/Modal/layouts/ModalFooterShadow.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalFooterShadow.types.ts b/packages/core/src/components/Modal/layouts/ModalFooterShadow.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalFooterShadow.types.ts
rename to packages/core/src/components/Modal/layouts/ModalFooterShadow.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.module.scss b/packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.module.scss
rename to packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.tsx b/packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.tsx
rename to packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.types.ts b/packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalLayoutScrollableContent.types.ts
rename to packages/core/src/components/Modal/layouts/ModalLayoutScrollableContent.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMedia.module.scss b/packages/core/src/components/Modal/layouts/ModalMedia.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMedia.module.scss
rename to packages/core/src/components/Modal/layouts/ModalMedia.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMedia.tsx b/packages/core/src/components/Modal/layouts/ModalMedia.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMedia.tsx
rename to packages/core/src/components/Modal/layouts/ModalMedia.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMedia.types.ts b/packages/core/src/components/Modal/layouts/ModalMedia.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMedia.types.ts
rename to packages/core/src/components/Modal/layouts/ModalMedia.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.module.scss b/packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.module.scss
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.tsx b/packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.tsx
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.types.ts b/packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/ModalMediaLayout.types.ts
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/ModalMediaLayout.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.mdx b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.mdx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.mdx
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.mdx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.helpers.tsx b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.helpers.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.helpers.tsx
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.helpers.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.tsx b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.tsx
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayout.stories.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent.tsx b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent.tsx
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/media-image.png b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/media-image.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/media-image.png
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/media-image.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/ratio-do.png b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/ratio-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/ratio-do.png
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/ratio-do.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/ratio-dont.png b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/ratio-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/ratio-dont.png
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/ratio-dont.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/related-component.png b/packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/related-component.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalMediaLayout/__stories__/assets/related-component.png
rename to packages/core/src/components/Modal/layouts/ModalMediaLayout/__stories__/assets/related-component.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.module.scss b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.module.scss
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.module.scss
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.module.scss
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.tsx b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.tsx
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.types.ts b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.types.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/ModalSideBySideLayout.types.ts
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/ModalSideBySideLayout.types.ts
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.mdx b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.mdx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.mdx
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.mdx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.helpers.tsx b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.helpers.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.helpers.tsx
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.helpers.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.tsx b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.tsx
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayout.stories.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent.tsx b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent.tsx
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent.tsx
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent.tsx
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-do.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-do.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-do.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-dont.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-dont.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/breakdown-dont.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/columns-do.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/columns-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/columns-do.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/columns-do.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/columns-dont.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/columns-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/columns-dont.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/columns-dont.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/media-image.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/media-image.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/media-image.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/media-image.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/related-component.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/related-component.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/related-component.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/related-component.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/wizard-do.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/wizard-do.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/wizard-do.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/wizard-do.png
diff --git a/packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/wizard-dont.png b/packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/wizard-dont.png
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/ModalSideBySideLayout/__stories__/assets/wizard-dont.png
rename to packages/core/src/components/Modal/layouts/ModalSideBySideLayout/__stories__/assets/wizard-dont.png
diff --git a/packages/core/src/components/ModalNew/layouts/useLayoutScrolledContent.ts b/packages/core/src/components/Modal/layouts/useLayoutScrolledContent.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/layouts/useLayoutScrolledContent.ts
rename to packages/core/src/components/Modal/layouts/useLayoutScrolledContent.ts
diff --git a/packages/core/src/components/ModalNew/utils/animationVariants.ts b/packages/core/src/components/Modal/utils/animationVariants.ts
similarity index 100%
rename from packages/core/src/components/ModalNew/utils/animationVariants.ts
rename to packages/core/src/components/Modal/utils/animationVariants.ts
diff --git a/packages/core/src/storybook/components/related-components/component-description-map.tsx b/packages/core/src/storybook/components/related-components/component-description-map.tsx
index 74029fd604..283e89b7f2 100644
--- a/packages/core/src/storybook/components/related-components/component-description-map.tsx
+++ b/packages/core/src/storybook/components/related-components/component-description-map.tsx
@@ -59,9 +59,9 @@ import { BoxDescription } from "./descriptions/box-description";
 import { TableDescription } from "./descriptions/table-description";
 import { VirtualizedGridDescription } from "./descriptions/virtualized-grid-description/virtualized-grid-description";
 import { MenuGridItemDescription } from "./descriptions/menu-grid-item-description";
-import { ModalMediaLayoutRelatedComponent } from "../../../components/ModalNew/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent";
-import { ModalSideBySideLayoutRelatedComponent } from "../../../components/ModalNew/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent";
-import { ModalBasicLayoutRelatedComponent } from "../../../components/ModalNew/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent";
+import { ModalMediaLayoutRelatedComponent } from "../../../components/Modal/layouts/ModalMediaLayout/__stories__/ModalMediaLayoutRelatedComponent";
+import { ModalSideBySideLayoutRelatedComponent } from "../../../components/Modal/layouts/ModalSideBySideLayout/__stories__/ModalSideBySideLayoutRelatedComponent";
+import { ModalBasicLayoutRelatedComponent } from "../../../components/Modal/layouts/ModalBasicLayout/__stories__/ModalBasicLayoutRelatedComponent";
 
 export const SPLIT_BUTTON = "split-button";
 export const BUTTON_GROUP = "button-group";