diff --git a/java/compiler/forms-compiler/forms-compiler.iml b/java/compiler/forms-compiler/forms-compiler.iml
new file mode 100644
index 000000000000..984cb98c08d1
--- /dev/null
+++ b/java/compiler/forms-compiler/forms-compiler.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="JDOM" level="project" />
+    <orderEntry type="module" module-name="forms_rt" />
+    <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
+    <orderEntry type="library" name="jgoodies-forms" level="project" />
+  </component>
+</module>
+
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AlienFormFileException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AlienFormFileException.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/AlienFormFileException.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AlienFormFileException.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/ClassToBindNotFoundException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ClassToBindNotFoundException.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/ClassToBindNotFoundException.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ClassToBindNotFoundException.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/CodeGenerationException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/CodeGenerationException.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/CodeGenerationException.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/CodeGenerationException.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/ColorPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ColorPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/ColorPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ColorPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/DimensionPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/DimensionPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/DimensionPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/DimensionPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/EnumPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/EnumPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/EnumPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/EnumPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/FlowLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FlowLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/FlowLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FlowLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/FontPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FontPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/FontPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FontPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormErrorInfo.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormErrorInfo.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormErrorInfo.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormErrorInfo.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormLayoutUtils.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutUtils.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/FormLayoutUtils.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FormLayoutUtils.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridBagConverter.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridBagConverter.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridBagConverter.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridBagConverter.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridBagLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridBagLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridBagLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridBagLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/GridLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/GridLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/IconPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/IconPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/IconPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/IconPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/LayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/LayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/LayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/LayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/ListModelPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ListModelPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/ListModelPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ListModelPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/NestedFormLoader.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/NestedFormLoader.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/NestedFormLoader.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/NestedFormLoader.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/PropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/PropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/PropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/PropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/RectanglePropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/RectanglePropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/RectanglePropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/RectanglePropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/RecursiveFormNestingException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/RecursiveFormNestingException.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/RecursiveFormNestingException.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/RecursiveFormNestingException.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/ScrollPaneLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ScrollPaneLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/ScrollPaneLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ScrollPaneLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/SimpleLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SimpleLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/SimpleLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SimpleLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/SplitPaneLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SplitPaneLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/SplitPaneLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/SplitPaneLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/TabbedPaneLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/TabbedPaneLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/TabbedPaneLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/TabbedPaneLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/ToolBarLayoutCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ToolBarLayoutCodeGenerator.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/ToolBarLayoutCodeGenerator.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/ToolBarLayoutCodeGenerator.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/UnexpectedFormElementException.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/compiler/Utils.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/Utils.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/compiler/Utils.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/Utils.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/BorderLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/BorderLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/BorderLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/BorderLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/CardLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/CardLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/CardLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/CardLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/ColorDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/ColorDescriptor.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/CompiledClassPropertiesProvider.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/CompiledClassPropertiesProvider.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/CompiledClassPropertiesProvider.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/CompiledClassPropertiesProvider.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/ComponentVisitor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ComponentVisitor.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/ComponentVisitor.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ComponentVisitor.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/FlowLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FlowLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/FlowLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FlowLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/FontDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/FontDescriptor.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/FormLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FormLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/FormLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FormLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/GridBagLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/GridBagLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/GridBagLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/GridBagLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/GridLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/GridLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/GridLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/GridLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IButtonGroup.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IButtonGroup.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IButtonGroup.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IButtonGroup.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IComponent.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IComponent.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IComponent.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IComponent.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IContainer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IContainer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IContainer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IContainer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IRootContainer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IRootContainer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IRootContainer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IRootContainer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/ITabbedPane.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ITabbedPane.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/ITabbedPane.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ITabbedPane.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/IconDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IconDescriptor.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/IconDescriptor.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/IconDescriptor.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwAtomicComponent.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwAtomicComponent.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwAtomicComponent.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwAtomicComponent.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwButtonGroup.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwButtonGroup.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwButtonGroup.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwButtonGroup.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwComponent.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwComponent.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwComponent.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwComponent.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwContainer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwContainer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwContainer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwContainer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwHSpacer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwHSpacer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwHSpacer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwHSpacer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwInspectionSuppression.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwInspectionSuppression.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwInspectionSuppression.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwInspectionSuppression.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroBooleanProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroBooleanProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroBooleanProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroBooleanProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroCharProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroCharProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroCharProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroCharProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroColorProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroColorProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroColorProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroColorProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroComponentProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroComponentProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroComponentProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroComponentProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroDimensionProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroDimensionProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroDimensionProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroDimensionProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroEnumProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroEnumProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroEnumProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroEnumProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroFontProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroFontProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroFontProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroFontProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroIconProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroIconProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroIconProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroIconProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroInsetsProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroInsetsProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroInsetsProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroInsetsProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroIntProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroIntProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroIntProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroIntProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroListModelProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroListModelProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroListModelProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroListModelProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroPrimitiveTypeProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroPrimitiveTypeProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroPrimitiveTypeProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroPrimitiveTypeProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroRectangleProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroRectangleProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntroRectangleProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntroRectangleProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntrospectedProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntrospectedProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwIntrospectedProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwIntrospectedProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwNestedForm.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwNestedForm.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwNestedForm.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwNestedForm.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwRbIntroStringProperty.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwRbIntroStringProperty.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwRbIntroStringProperty.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwRbIntroStringProperty.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwRootContainer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwRootContainer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwRootContainer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwRootContainer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwScrollPane.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwScrollPane.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwScrollPane.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwScrollPane.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwSplitPane.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwSplitPane.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwSplitPane.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwSplitPane.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwTabbedPane.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwTabbedPane.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwTabbedPane.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwTabbedPane.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwToolBar.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwToolBar.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwToolBar.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwToolBar.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwVSpacer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwVSpacer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwVSpacer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwVSpacer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/LwXmlReader.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwXmlReader.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/LwXmlReader.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/LwXmlReader.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/PropertiesProvider.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/PropertiesProvider.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/PropertiesProvider.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/PropertiesProvider.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/StringDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/StringDescriptor.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/lw/XYLayoutSerializer.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/XYLayoutSerializer.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/lw/XYLayoutSerializer.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/XYLayoutSerializer.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/shared/BorderType.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/shared/BorderType.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java
diff --git a/UIDesignerCore/src/com/intellij/uiDesigner/shared/XYLayoutManager.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/XYLayoutManager.java
similarity index 100%
rename from UIDesignerCore/src/com/intellij/uiDesigner/shared/XYLayoutManager.java
rename to java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/XYLayoutManager.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/EliminateTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EliminateTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/EliminateTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EliminateTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/EmptyPanelTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EmptyPanelTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/EmptyPanelTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EmptyPanelTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/EqualSizeCellsTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EqualSizeCellsTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/EqualSizeCellsTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/EqualSizeCellsTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/GapsTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GapsTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/GapsTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GapsTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/GridBagConverterTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/GridBagConverterTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/IndentTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/IndentTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/IndentTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/IndentTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout2Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout2Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout2Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout2Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout3Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout3Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout3Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout3Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout4Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout4Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout4Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout4Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout5Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout5Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout5Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout5Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout6Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout6Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout6Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout6Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout7Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout7Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout7Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout7Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout8Test.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout8Test.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/Layout8Test.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/Layout8Test.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/PrefSizeTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/PrefSizeTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/PrefSizeTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/PrefSizeTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/SpansTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/SpansTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/SpansTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/SpansTest.java
diff --git a/UIDesignerCore/testSource/com/intellij/uiDesigner/core/TextAreasTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
similarity index 100%
rename from UIDesignerCore/testSource/com/intellij/uiDesigner/core/TextAreasTest.java
rename to java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/TextAreasTest.java
diff --git a/javac2/javac2.iml b/javac2/javac2.iml
index 4e6761b5ac93..49c3fa54efee 100644
--- a/javac2/javac2.iml
+++ b/javac2/javac2.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Ant" level="project" />
-    <orderEntry type="module" module-name="UIDesignerCore" />
+    <orderEntry type="module" module-name="forms-compiler" />
     <orderEntry type="module" module-name="forms_rt" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="notNull" />
diff --git a/ui-designer/impl/ui-designer-impl.iml b/ui-designer/impl/ui-designer-impl.iml
index af34fb5126cc..e2007a644227 100644
--- a/ui-designer/impl/ui-designer-impl.iml
+++ b/ui-designer/impl/ui-designer-impl.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="idea" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="UIDesignerCore" />
+    <orderEntry type="module" module-name="forms-compiler" />
     <orderEntry type="module" module-name="forms_rt" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="compiler-openapi" />