diff --git a/.idea/modules.xml b/.idea/modules.xml
index f5abba4135ca..f2f39fcee019 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -668,6 +668,7 @@
+
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 41a495357412..b58dbfbf3dae 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -92,6 +92,8 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
// do we need it?
"intellij.platform.sqlite",
//"fleet.rpc.server",
+ // todo not used by platform - move to plugin
+ "intellij.platform.ide.designer",
)
@Suppress("RemoveRedundantQualifierName")
diff --git a/platform/platform-impl/designer/intellij.platform.ide.designer.iml b/platform/platform-impl/designer/intellij.platform.ide.designer.iml
new file mode 100644
index 000000000000..6022bfb841a6
--- /dev/null
+++ b/platform/platform-impl/designer/intellij.platform.ide.designer.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/designer/DesignerEditorPanelFacade.java b/platform/platform-impl/designer/src/com/intellij/designer/DesignerEditorPanelFacade.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/DesignerEditorPanelFacade.java
rename to platform/platform-impl/designer/src/com/intellij/designer/DesignerEditorPanelFacade.java
diff --git a/platform/platform-impl/src/com/intellij/designer/LightFillLayout.java b/platform/platform-impl/designer/src/com/intellij/designer/LightFillLayout.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/LightFillLayout.java
rename to platform/platform-impl/designer/src/com/intellij/designer/LightFillLayout.java
diff --git a/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java b/platform/platform-impl/designer/src/com/intellij/designer/LightToolWindow.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/LightToolWindow.java
rename to platform/platform-impl/designer/src/com/intellij/designer/LightToolWindow.java
diff --git a/platform/platform-impl/src/com/intellij/designer/LightToolWindowContent.java b/platform/platform-impl/designer/src/com/intellij/designer/LightToolWindowContent.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/LightToolWindowContent.java
rename to platform/platform-impl/designer/src/com/intellij/designer/LightToolWindowContent.java
diff --git a/platform/platform-impl/src/com/intellij/designer/LightToolWindowManager.java b/platform/platform-impl/designer/src/com/intellij/designer/LightToolWindowManager.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/LightToolWindowManager.java
rename to platform/platform-impl/designer/src/com/intellij/designer/LightToolWindowManager.java
diff --git a/platform/platform-impl/src/com/intellij/designer/ToggleEditorModeAction.java b/platform/platform-impl/designer/src/com/intellij/designer/ToggleEditorModeAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/ToggleEditorModeAction.java
rename to platform/platform-impl/designer/src/com/intellij/designer/ToggleEditorModeAction.java
diff --git a/platform/platform-impl/src/com/intellij/designer/model/ErrorInfo.java b/platform/platform-impl/designer/src/com/intellij/designer/model/ErrorInfo.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/model/ErrorInfo.java
rename to platform/platform-impl/designer/src/com/intellij/designer/model/ErrorInfo.java
diff --git a/platform/platform-impl/src/com/intellij/designer/model/PropertiesContainer.java b/platform/platform-impl/designer/src/com/intellij/designer/model/PropertiesContainer.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/model/PropertiesContainer.java
rename to platform/platform-impl/designer/src/com/intellij/designer/model/PropertiesContainer.java
diff --git a/platform/platform-impl/src/com/intellij/designer/model/Property.java b/platform/platform-impl/designer/src/com/intellij/designer/model/Property.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/model/Property.java
rename to platform/platform-impl/designer/src/com/intellij/designer/model/Property.java
diff --git a/platform/platform-impl/src/com/intellij/designer/model/PropertyContext.java b/platform/platform-impl/designer/src/com/intellij/designer/model/PropertyContext.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/model/PropertyContext.java
rename to platform/platform-impl/designer/src/com/intellij/designer/model/PropertyContext.java
diff --git a/platform/platform-impl/src/com/intellij/designer/model/QuickFix.java b/platform/platform-impl/designer/src/com/intellij/designer/model/QuickFix.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/model/QuickFix.java
rename to platform/platform-impl/designer/src/com/intellij/designer/model/QuickFix.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/InplaceContext.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/InplaceContext.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/InplaceContext.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/InplaceContext.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyEditor.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyEditor.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyEditor.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyEditor.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyEditorListener.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyEditorListener.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyEditorListener.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyEditorListener.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyRenderer.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyRenderer.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyRenderer.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyRenderer.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyTable.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/PropertyTable.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/BooleanEditor.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/editors/ComboEditor.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/ComboEditor.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/editors/ComboEditor.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/ComboEditor.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/editors/TextEditor.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/TextEditor.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/editors/TextEditor.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/editors/TextEditor.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/renderers/BooleanRenderer.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/renderers/BooleanRenderer.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/renderers/BooleanRenderer.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/renderers/BooleanRenderer.java
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/renderers/LabelPropertyRenderer.java b/platform/platform-impl/designer/src/com/intellij/designer/propertyTable/renderers/LabelPropertyRenderer.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/designer/propertyTable/renderers/LabelPropertyRenderer.java
rename to platform/platform-impl/designer/src/com/intellij/designer/propertyTable/renderers/LabelPropertyRenderer.java
diff --git a/plugins/ui-designer-core/intellij.uiDesigner.iml b/plugins/ui-designer-core/intellij.uiDesigner.iml
index 4e4c1b4e986f..06bc029f5538 100644
--- a/plugins/ui-designer-core/intellij.uiDesigner.iml
+++ b/plugins/ui-designer-core/intellij.uiDesigner.iml
@@ -18,5 +18,6 @@
+
\ No newline at end of file
diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.iml b/plugins/ui-designer/intellij.java.guiForms.designer.iml
index 3db64cbb1ce3..a2cb12cb3b31 100644
--- a/plugins/ui-designer/intellij.java.guiForms.designer.iml
+++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml
@@ -25,6 +25,7 @@
+