diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml
index ede529ef11f6..b94c45bdfa5c 100644
--- a/java/compiler/impl/compiler-impl.iml
+++ b/java/compiler/impl/compiler-impl.iml
@@ -29,6 +29,8 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="idea-ui" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 6589a8363227..c29634890722 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -33,15 +33,15 @@ import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.SourceFolder;
 import com.intellij.openapi.roots.ex.ProjectRootManagerEx;
-import com.intellij.openapi.roots.ui.configuration.ClasspathEditor;
 import com.intellij.openapi.roots.ui.configuration.CommonContentEntriesEditor;
-import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
@@ -59,7 +59,10 @@ import com.intellij.psi.PsiCompiledElement;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import com.intellij.util.*;
+import com.intellij.util.Chunk;
+import com.intellij.util.LocalTimeCounter;
+import com.intellij.util.StringBuilderSpinAllocator;
+import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.OrderedSet;
@@ -1739,7 +1742,7 @@ public class CompileDriver {
       }
     }
     if (!modulesWithoutJdkAssigned.isEmpty()) {
-      showNotSpecifiedError("error.jdk.not.specified", modulesWithoutJdkAssigned, ClasspathEditor.NAME);
+      showNotSpecifiedError("error.jdk.not.specified", modulesWithoutJdkAssigned, ProjectBundle.message("modules.classpath.title"));
       return false;
     }
 
@@ -1955,7 +1958,7 @@ public class CompileDriver {
   }
 
   private void showConfigurationDialog(String moduleNameToSelect, String tabNameToSelect) {
-    ModulesConfigurator.showDialog(myProject, moduleNameToSelect, tabNameToSelect, false);
+    ProjectSettingsService.getInstance(myProject).showModuleConfigurationDialog(moduleNameToSelect, tabNameToSelect, false);
   }
 
   private static VirtualFile lookupVFile(final IntermediateOutputCompiler compiler, final Module module, final boolean forTestSources) {
diff --git a/java/idea-ui/idea-ui.iml b/java/idea-ui/idea-ui.iml
new file mode 100644
index 000000000000..3618b7ce3287
--- /dev/null
+++ b/java/idea-ui/idea-ui.iml
@@ -0,0 +1,25 @@
+<?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" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="compiler-openapi" />
+    <orderEntry type="module" module-name="compiler-impl" />
+    <orderEntry type="module" module-name="java-impl" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../lib/xmlrpc-2.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
+
diff --git a/source/com/intellij/facet/FacetInfo.java b/java/idea-ui/src/com/intellij/facet/FacetInfo.java
similarity index 100%
rename from source/com/intellij/facet/FacetInfo.java
rename to java/idea-ui/src/com/intellij/facet/FacetInfo.java
diff --git a/source/com/intellij/facet/impl/DefaultFacetsProvider.java b/java/idea-ui/src/com/intellij/facet/impl/DefaultFacetsProvider.java
similarity index 100%
rename from source/com/intellij/facet/impl/DefaultFacetsProvider.java
rename to java/idea-ui/src/com/intellij/facet/impl/DefaultFacetsProvider.java
diff --git a/source/com/intellij/facet/impl/ProjectFacetsConfigurator.java b/java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java
similarity index 100%
rename from source/com/intellij/facet/impl/ProjectFacetsConfigurator.java
rename to java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java
diff --git a/source/com/intellij/facet/impl/autodetecting/AutodetectionFilter.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/AutodetectionFilter.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/AutodetectionFilter.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/AutodetectionFilter.java
diff --git a/source/com/intellij/facet/impl/autodetecting/DefaultDetectedFacetPresentation.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/DefaultDetectedFacetPresentation.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/DefaultDetectedFacetPresentation.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/DefaultDetectedFacetPresentation.java
diff --git a/source/com/intellij/facet/impl/autodetecting/DetectedFacetManager.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/DetectedFacetManager.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/DetectedFacetManager.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/DetectedFacetManager.java
diff --git a/source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionByTypeElement.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionByTypeElement.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionByTypeElement.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionByTypeElement.java
diff --git a/source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInModuleElement.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInModuleElement.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInModuleElement.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInModuleElement.java
diff --git a/source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInfo.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/DisabledAutodetectionInfo.java
diff --git a/source/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetAutodetectingManager.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManager.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetAutodetectingManager.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManager.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetAutodetectingManagerImpl.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetByPsiFileDetectorWrapper.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetByPsiFileDetectorWrapper.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetByPsiFileDetectorWrapper.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetByPsiFileDetectorWrapper.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetByVirtualFileDetectorWrapper.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetByVirtualFileDetectorWrapper.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetByVirtualFileDetectorWrapper.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetByVirtualFileDetectorWrapper.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetDetectionIndex.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectionIndex.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetDetectionIndex.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectionIndex.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetDetectionIndexEntry.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectionIndexEntry.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetDetectionIndexEntry.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectionIndexEntry.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetDetectorForWizardRegistry.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorForWizardRegistry.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetDetectorForWizardRegistry.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorForWizardRegistry.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetDetectorRegistryEx.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorRegistryEx.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetDetectorRegistryEx.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorRegistryEx.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetDetectorWrapper.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorWrapper.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetDetectorWrapper.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetDetectorWrapper.java
diff --git a/source/com/intellij/facet/impl/autodetecting/FacetOnTheFlyDetectorRegistry.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetOnTheFlyDetectorRegistry.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/FacetOnTheFlyDetectorRegistry.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/FacetOnTheFlyDetectorRegistry.java
diff --git a/source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form
diff --git a/source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.java
diff --git a/source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTree.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTree.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTree.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTree.java
diff --git a/source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTreeComponent.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTreeComponent.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTreeComponent.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsTreeComponent.java
diff --git a/source/com/intellij/facet/impl/autodetecting/facetsTree/ImplicitFacetsTreeComponent.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/ImplicitFacetsTreeComponent.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/facetsTree/ImplicitFacetsTreeComponent.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/ImplicitFacetsTreeComponent.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfo.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfo.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfoImpl.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfoImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfoImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/DetectedFacetInfoImpl.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/FacetInfo2.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfo2.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/FacetInfo2.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfo2.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/FacetInfoBackedByFacet.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfoBackedByFacet.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/FacetInfoBackedByFacet.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfoBackedByFacet.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/FacetInfoSet.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfoSet.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/FacetInfoSet.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/FacetInfoSet.java
diff --git a/source/com/intellij/facet/impl/autodetecting/model/ProjectFacetInfoSet.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/ProjectFacetInfoSet.java
similarity index 100%
rename from source/com/intellij/facet/impl/autodetecting/model/ProjectFacetInfoSet.java
rename to java/idea-ui/src/com/intellij/facet/impl/autodetecting/model/ProjectFacetInfoSet.java
diff --git a/source/com/intellij/facet/impl/pointers/FacetPointerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/pointers/FacetPointerImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java
diff --git a/source/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java
diff --git a/source/com/intellij/facet/impl/ui/FacetContextChangeListener.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetContextChangeListener.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetContextChangeListener.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetContextChangeListener.java
diff --git a/source/com/intellij/facet/impl/ui/FacetDetectionProcessor.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetDetectionProcessor.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetDetectionProcessor.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetDetectionProcessor.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorContextBase.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorContextBase.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorContextBase.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorContextBase.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorFacade.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorFacade.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorFacade.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorFacade.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorsStateManager.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManager.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorsStateManager.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManager.java
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorsStateManagerImpl.java
diff --git a/source/com/intellij/facet/impl/ui/FacetErrorPanel.form b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetErrorPanel.form
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetErrorPanel.form
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetErrorPanel.form
diff --git a/source/com/intellij/facet/impl/ui/FacetErrorPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetErrorPanel.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetErrorPanel.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetErrorPanel.java
diff --git a/source/com/intellij/facet/impl/ui/FacetTreeModel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetTreeModel.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java
diff --git a/source/com/intellij/facet/impl/ui/FacetTypeFrameworkSupportProvider.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTypeFrameworkSupportProvider.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/FacetTypeFrameworkSupportProvider.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/FacetTypeFrameworkSupportProvider.java
diff --git a/source/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
diff --git a/source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java b/java/idea-ui/src/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
diff --git a/source/com/intellij/facet/impl/ui/VersionConfigurable.java b/java/idea-ui/src/com/intellij/facet/impl/ui/VersionConfigurable.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/VersionConfigurable.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/VersionConfigurable.java
diff --git a/source/com/intellij/facet/impl/ui/VersionedFrameworkSupportProvider.java b/java/idea-ui/src/com/intellij/facet/impl/ui/VersionedFrameworkSupportProvider.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/VersionedFrameworkSupportProvider.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/VersionedFrameworkSupportProvider.java
diff --git a/source/com/intellij/facet/impl/ui/actions/AddFacetAction.java b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetAction.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/actions/AddFacetAction.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetAction.java
diff --git a/source/com/intellij/facet/impl/ui/actions/AddFacetActionGroup.java b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetActionGroup.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/actions/AddFacetActionGroup.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetActionGroup.java
diff --git a/source/com/intellij/facet/impl/ui/actions/GroupToolbarAction.java b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/GroupToolbarAction.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/actions/GroupToolbarAction.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/actions/GroupToolbarAction.java
diff --git a/source/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/facetType/DefaultFacetSettingsConfigurable.java
diff --git a/source/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form
similarity index 100%
rename from source/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form
rename to java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form
diff --git a/source/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.java b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.java
diff --git a/source/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetTypeEditor.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/ChooseLibrariesDialog.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/ChooseLibrariesDialog.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/ChooseLibrariesDialog.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/ChooseLibrariesDialog.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/DelegatingLibrariesValidatorContext.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DelegatingLibrariesValidatorContext.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/DelegatingLibrariesValidatorContext.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DelegatingLibrariesValidatorContext.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibrariesValidationComponentImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidationComponentImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibrariesValidationComponentImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidationComponentImpl.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContext.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContext.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContext.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContext.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContextImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContextImpl.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContextImpl.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibrariesValidatorContextImpl.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.form b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.form
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.form
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.form
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/LibraryDownloadingMirrorsMap.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadingMirrorsMap.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/LibraryDownloadingMirrorsMap.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloadingMirrorsMap.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.form b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.form
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.form
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.form
diff --git a/source/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RemoteRepositoryMirrorPanel.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/RequiredLibrariesInfo.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationInfo.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationInfo.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationManager.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationManager.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationManager.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibrariesConfigurationManager.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/versions/LibraryConfigurationInfo.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibraryConfigurationInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/versions/LibraryConfigurationInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibraryConfigurationInfo.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/versions/LibraryVersionInfo.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibraryVersionInfo.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/versions/LibraryVersionInfo.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/LibraryVersionInfo.java
diff --git a/source/com/intellij/facet/impl/ui/libraries/versions/VersionsComponent.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/VersionsComponent.java
similarity index 100%
rename from source/com/intellij/facet/impl/ui/libraries/versions/VersionsComponent.java
rename to java/idea-ui/src/com/intellij/facet/impl/ui/libraries/versions/VersionsComponent.java
diff --git a/source/com/intellij/ide/RecentProjectsManager.java b/java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java
similarity index 100%
rename from source/com/intellij/ide/RecentProjectsManager.java
rename to java/idea-ui/src/com/intellij/ide/RecentProjectsManager.java
diff --git a/source/com/intellij/ide/actions/NewProjectAction.java b/java/idea-ui/src/com/intellij/ide/actions/NewProjectAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/NewProjectAction.java
rename to java/idea-ui/src/com/intellij/ide/actions/NewProjectAction.java
diff --git a/source/com/intellij/ide/actions/OpenProjectAction.java b/java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/OpenProjectAction.java
rename to java/idea-ui/src/com/intellij/ide/actions/OpenProjectAction.java
diff --git a/source/com/intellij/ide/actions/ShowModulePropertiesAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/ShowModulePropertiesAction.java
rename to java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java
diff --git a/source/com/intellij/ide/actions/WhatsNewAction.java b/java/idea-ui/src/com/intellij/ide/actions/WhatsNewAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/WhatsNewAction.java
rename to java/idea-ui/src/com/intellij/ide/actions/WhatsNewAction.java
diff --git a/source/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
similarity index 100%
rename from source/com/intellij/ide/impl/NewProjectUtil.java
rename to java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
diff --git a/source/com/intellij/ide/impl/ProjectSettingsSelectInTarget.java b/java/idea-ui/src/com/intellij/ide/impl/ProjectSettingsSelectInTarget.java
similarity index 100%
rename from source/com/intellij/ide/impl/ProjectSettingsSelectInTarget.java
rename to java/idea-ui/src/com/intellij/ide/impl/ProjectSettingsSelectInTarget.java
diff --git a/source/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportAction.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportAction.java
similarity index 100%
rename from source/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportAction.java
rename to java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportAction.java
diff --git a/source/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java
similarity index 100%
rename from source/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java
rename to java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java
diff --git a/source/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
similarity index 100%
rename from source/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
rename to java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
diff --git a/source/com/intellij/ide/util/importProject/DelegatingProgressIndicator.java b/java/idea-ui/src/com/intellij/ide/util/importProject/DelegatingProgressIndicator.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/DelegatingProgressIndicator.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/DelegatingProgressIndicator.java
diff --git a/source/com/intellij/ide/util/importProject/FacetDetectionStep.form b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetDetectionStep.form
similarity index 100%
rename from source/com/intellij/ide/util/importProject/FacetDetectionStep.form
rename to java/idea-ui/src/com/intellij/ide/util/importProject/FacetDetectionStep.form
diff --git a/source/com/intellij/ide/util/importProject/FacetDetectionStep.java b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetDetectionStep.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/FacetDetectionStep.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/FacetDetectionStep.java
diff --git a/source/com/intellij/ide/util/importProject/LibrariesDetectionStep.java b/java/idea-ui/src/com/intellij/ide/util/importProject/LibrariesDetectionStep.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/LibrariesDetectionStep.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/LibrariesDetectionStep.java
diff --git a/source/com/intellij/ide/util/importProject/LibrariesLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/LibrariesLayoutPanel.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/LibrariesLayoutPanel.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/LibrariesLayoutPanel.java
diff --git a/source/com/intellij/ide/util/importProject/LibraryDescriptor.java b/java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/LibraryDescriptor.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java
diff --git a/source/com/intellij/ide/util/importProject/ModuleDescriptor.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ModuleDescriptor.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java
diff --git a/source/com/intellij/ide/util/importProject/ModuleInsight.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ModuleInsight.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
diff --git a/source/com/intellij/ide/util/importProject/ModulesDetectionStep.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModulesDetectionStep.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ModulesDetectionStep.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ModulesDetectionStep.java
diff --git a/source/com/intellij/ide/util/importProject/ModulesLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModulesLayoutPanel.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ModulesLayoutPanel.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ModulesLayoutPanel.java
diff --git a/source/com/intellij/ide/util/importProject/ProgressIndicatorWrapper.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProgressIndicatorWrapper.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ProgressIndicatorWrapper.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ProgressIndicatorWrapper.java
diff --git a/source/com/intellij/ide/util/importProject/ProjectLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
similarity index 100%
rename from source/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
rename to java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.form b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.form
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.form
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.form
diff --git a/source/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/FrameworkSupportConfigurable.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportConfigurable.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/FrameworkSupportConfigurable.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportConfigurable.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/FrameworkSupportModel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportModel.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/FrameworkSupportModel.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportModel.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/FrameworkSupportModelListener.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportModelListener.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/FrameworkSupportModelListener.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportModelListener.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/FrameworkSupportProvider.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportProvider.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/FrameworkSupportProvider.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportProvider.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/ProjectFromSourcesBuilder.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectFromSourcesBuilder.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/ProjectFromSourcesBuilder.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectFromSourcesBuilder.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/ProjectNameStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameStep.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/ProjectNameStep.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameStep.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form
diff --git a/source/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/StepSequence.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/StepSequence.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/SupportForFrameworksStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SupportForFrameworksStep.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/SupportForFrameworksStep.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SupportForFrameworksStep.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelImpl.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelImpl.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelImpl.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelImpl.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java
diff --git a/source/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java
similarity index 100%
rename from source/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java
rename to java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java
diff --git a/source/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java
diff --git a/source/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
diff --git a/source/com/intellij/ide/util/projectWizard/JdkChooserPanel.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
diff --git a/source/com/intellij/ide/util/projectWizard/LibraryFilter.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/LibraryFilter.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/LibraryFilter.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/LibraryFilter.java
diff --git a/source/com/intellij/ide/util/projectWizard/ModuleCreationPromptStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleCreationPromptStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ModuleCreationPromptStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleCreationPromptStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ModuleTypeStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ModuleTypeStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/NameLocationStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/NameLocationStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/NamePathComponent.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/NamePathComponent.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/NamePathComponent.java
diff --git a/source/com/intellij/ide/util/projectWizard/OutputPathsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/OutputPathsStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/OutputPathsStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/OutputPathsStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectJdkStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectJdkStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectNameStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectNameStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectNameStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectNameStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectOutputPathsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectOutputPathsStep.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectOutputPathsStep.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectOutputPathsStep.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
diff --git a/source/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java
similarity index 100%
rename from source/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java
rename to java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardUtil.java
diff --git a/source/com/intellij/jar/BuildJarAction.java b/java/idea-ui/src/com/intellij/jar/BuildJarAction.java
similarity index 100%
rename from source/com/intellij/jar/BuildJarAction.java
rename to java/idea-ui/src/com/intellij/jar/BuildJarAction.java
diff --git a/source/com/intellij/jar/BuildJarDialog.form b/java/idea-ui/src/com/intellij/jar/BuildJarDialog.form
similarity index 100%
rename from source/com/intellij/jar/BuildJarDialog.form
rename to java/idea-ui/src/com/intellij/jar/BuildJarDialog.form
diff --git a/source/com/intellij/jar/BuildJarDialog.java b/java/idea-ui/src/com/intellij/jar/BuildJarDialog.java
similarity index 100%
rename from source/com/intellij/jar/BuildJarDialog.java
rename to java/idea-ui/src/com/intellij/jar/BuildJarDialog.java
diff --git a/source/com/intellij/jar/BuildJarProjectSettings.java b/java/idea-ui/src/com/intellij/jar/BuildJarProjectSettings.java
similarity index 100%
rename from source/com/intellij/jar/BuildJarProjectSettings.java
rename to java/idea-ui/src/com/intellij/jar/BuildJarProjectSettings.java
diff --git a/source/com/intellij/jar/BuildJarRefactoringListenerProvider.java b/java/idea-ui/src/com/intellij/jar/BuildJarRefactoringListenerProvider.java
similarity index 100%
rename from source/com/intellij/jar/BuildJarRefactoringListenerProvider.java
rename to java/idea-ui/src/com/intellij/jar/BuildJarRefactoringListenerProvider.java
diff --git a/source/com/intellij/jar/BuildJarSettings.java b/java/idea-ui/src/com/intellij/jar/BuildJarSettings.java
similarity index 100%
rename from source/com/intellij/jar/BuildJarSettings.java
rename to java/idea-ui/src/com/intellij/jar/BuildJarSettings.java
diff --git a/source/com/intellij/jar/JarCompiler.java b/java/idea-ui/src/com/intellij/jar/JarCompiler.java
similarity index 100%
rename from source/com/intellij/jar/JarCompiler.java
rename to java/idea-ui/src/com/intellij/jar/JarCompiler.java
diff --git a/source/com/intellij/jar/JarPackagingEditorPolicy.java b/java/idea-ui/src/com/intellij/jar/JarPackagingEditorPolicy.java
similarity index 100%
rename from source/com/intellij/jar/JarPackagingEditorPolicy.java
rename to java/idea-ui/src/com/intellij/jar/JarPackagingEditorPolicy.java
diff --git a/source/com/intellij/jar/JarPackagingTreeBuilder.java b/java/idea-ui/src/com/intellij/jar/JarPackagingTreeBuilder.java
similarity index 100%
rename from source/com/intellij/jar/JarPackagingTreeBuilder.java
rename to java/idea-ui/src/com/intellij/jar/JarPackagingTreeBuilder.java
diff --git a/java/java-impl/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java b/java/idea-ui/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
similarity index 100%
rename from java/java-impl/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
rename to java/idea-ui/src/com/intellij/openapi/module/impl/ModuleConfigurationStateImpl.java
diff --git a/source/com/intellij/openapi/projectRoots/ui/NotifiableSdkModel.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/NotifiableSdkModel.java
similarity index 100%
rename from source/com/intellij/openapi/projectRoots/ui/NotifiableSdkModel.java
rename to java/idea-ui/src/com/intellij/openapi/projectRoots/ui/NotifiableSdkModel.java
diff --git a/source/com/intellij/openapi/projectRoots/ui/PathEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
similarity index 100%
rename from source/com/intellij/openapi/projectRoots/ui/PathEditor.java
rename to java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
diff --git a/source/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java
similarity index 100%
rename from source/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java
rename to java/idea-ui/src/com/intellij/openapi/projectRoots/ui/ProjectJdksEditor.java
diff --git a/source/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
similarity index 100%
rename from source/com/intellij/openapi/projectRoots/ui/SdkEditor.java
rename to java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
diff --git a/source/com/intellij/openapi/projectRoots/ui/Util.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/Util.java
similarity index 100%
rename from source/com/intellij/openapi/projectRoots/ui/Util.java
rename to java/idea-ui/src/com/intellij/openapi/projectRoots/ui/Util.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ActionsHeaderComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ActionsHeaderComponent.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ActionsHeaderComponent.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ActionsHeaderComponent.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/DefaultModuleConfigurationEditorFactoryImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleConfigurationEditorFactoryImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/DefaultModuleConfigurationEditorFactoryImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleConfigurationEditorFactoryImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
similarity index 84%
rename from source/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
index c594a2540ce6..91c0498733fe 100644
--- a/source/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
@@ -2,6 +2,7 @@ package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.ide.projectView.impl.nodes.NamedLibraryElement;
+import com.intellij.ide.util.projectWizard.JdkChooserPanel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
@@ -9,6 +10,7 @@ import com.intellij.openapi.roots.JdkOrderEntry;
 import com.intellij.openapi.roots.LibraryOrderEntry;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleStructureConfigurable;
+import com.intellij.openapi.projectRoots.Sdk;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -60,4 +62,14 @@ public class IdeaProjectSettingsService extends ProjectSettingsService {
     }
     return false;
   }
+
+  @Override
+  public void showModuleConfigurationDialog(String moduleToSelect, String tabNameToSelect, boolean showModuleWizard) {
+    ModulesConfigurator.showDialog(myProject, moduleToSelect, tabNameToSelect, showModuleWizard);
+  }
+
+  @Override
+  public Sdk chooseAndSetSdk() {
+    return JdkChooserPanel.chooseAndSetJDK(myProject);
+  }
 }
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JavaContentEntryEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntryEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JavaContentEntryEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntryEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JavaContentEntryTreeEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntryTreeEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JavaContentEntryTreeEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntryTreeEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LibrariesAlphaComparator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibrariesAlphaComparator.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LibrariesAlphaComparator.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibrariesAlphaComparator.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LibraryChooserElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryChooserElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LibraryChooserElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryChooserElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LibraryDependantsPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryDependantsPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LibraryDependantsPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryDependantsPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LibraryTableEditorForm.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryTableEditorForm.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LibraryTableEditorForm.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryTableEditorForm.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/LibraryTableModifiableModelProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryTableModifiableModelProvider.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/LibraryTableModifiableModelProvider.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryTableModifiableModelProvider.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleChooserElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleChooserElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleChooserElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleChooserElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleCreationInfo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleCreationInfo.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleCreationInfo.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleCreationInfo.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleDependantsPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleDependantsPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleDependantsPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleDependantsPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditorState.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleJdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleJdkConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleJdkConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleJdkConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleLevelConfigurablesEditorProvider.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/MoveTableRowButtonListener.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/MoveTableRowButtonListener.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/MoveTableRowButtonListener.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/MoveTableRowButtonListener.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/NamedLibrariesPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/NamedLibrariesPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/NamedLibrariesPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/NamedLibrariesPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/OrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OrderRootTypeUIFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/OrderRootTypeUIFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OrderRootTypeUIFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/OutputEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/OutputEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/OutputEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/PathUIUtils.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/SidePanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/SidePanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorEx.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorEx.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorEx.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorEx.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorListener.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorListener.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorListener.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorListener.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactValidationManagerImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactValidationManagerImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactValidationManagerImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactValidationManagerImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsEditorImpl.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsEditorImpl.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsEditorImpl.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsEditorImpl.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ChooseArtifactsDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ChooseArtifactsDialog.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ChooseArtifactsDialog.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ChooseArtifactsDialog.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeComponent.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeComponent.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeComponent.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeSelection.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeSelection.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeSelection.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTreeSelection.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementDraggingObject.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementDraggingObject.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementDraggingObject.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementDraggingObject.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/SimpleDnDAwareTree.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/SimpleDnDAwareTree.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/SimpleDnDAwareTree.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/SimpleDnDAwareTree.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/SourceItemsDraggingObject.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/SourceItemsDraggingObject.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/SourceItemsDraggingObject.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/SourceItemsDraggingObject.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorFindUsagesAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorFindUsagesAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorFindUsagesAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorFindUsagesAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactRootNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactRootNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactRootNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactRootNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactsTreeNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactsTreeNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactsTreeNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ArtifactsTreeNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ComplexPackagingElementNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ComplexPackagingElementNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ComplexPackagingElementNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/ComplexPackagingElementNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/CompositePackagingElementNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/CompositePackagingElementNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/CompositePackagingElementNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/CompositePackagingElementNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingElementNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingElementNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingElementNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingElementNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingNodeSource.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingNodeSource.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingNodeSource.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingNodeSource.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingTreeNodeFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingTreeNodeFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingTreeNodeFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/PackagingTreeNodeFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/DelegatedSourceItemPresentation.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/DelegatedSourceItemPresentation.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/DelegatedSourceItemPresentation.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/DelegatedSourceItemPresentation.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoDefaultLocationAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoDefaultLocationAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoDefaultLocationAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoDefaultLocationAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNodeBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNodeBase.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNodeBase.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNodeBase.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTree.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTree.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTree.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTree.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTreeRoot.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTreeRoot.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTreeRoot.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemsTreeRoot.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AbstractLibraryTreeStructure.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AbstractLibraryTreeStructure.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AbstractLibraryTreeStructure.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AbstractLibraryTreeStructure.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsOrderRootTypeUIFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsOrderRootTypeUIFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsOrderRootTypeUIFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseElementsDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseElementsDialog.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseElementsDialog.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseElementsDialog.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseModulesDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseModulesDialog.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseModulesDialog.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ChooseModulesDialog.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryFileChooser.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryFileChooser.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryFileChooser.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryFileChooser.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeBuilder.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeBuilder.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeBuilder.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeBuilder.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeContentElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeContentElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeContentElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeContentElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeStructure.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeStructure.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeStructure.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableTreeStructure.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeRenderer.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeRenderer.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeRenderer.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeRenderer.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeStructure.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeStructure.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeStructure.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTreeStructure.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElement.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElement.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElement.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElementDescriptor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElementDescriptor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesElementDescriptor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/libraryEditor/UrlComparator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/UrlComparator.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/libraryEditor/UrlComparator.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/UrlComparator.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementAction.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementAction.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementAction.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementPopupStep.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementPopupStep.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementPopupStep.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/AddPackagingElementPopupStep.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/ArchiveNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ArchiveNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/ArchiveNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ArchiveNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/ChooseLibrariesDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ChooseLibrariesDialog.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/ChooseLibrariesDialog.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ChooseLibrariesDialog.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/DirectoryNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/DirectoryNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/DirectoryNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/DirectoryNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryFileNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryFileNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryFileNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryFileNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNodeBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNodeBase.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNodeBase.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/LibraryNodeBase.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputBaseNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputBaseNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputBaseNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputBaseNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/ModuleOutputNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifact.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifact.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifact.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifact.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifactNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifactNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifactNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingArtifactNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditor.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditor.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditor.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorListener.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorListener.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorListener.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorListener.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorPolicy.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorPolicy.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorPolicy.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorPolicy.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorUtil.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorUtil.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorUtil.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingEditorUtil.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementPropertiesComponent.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementsToEditInfo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementsToEditInfo.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementsToEditInfo.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingElementsToEditInfo.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingNodeWeights.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingNodeWeights.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingNodeWeights.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingNodeWeights.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeBuilder.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeBuilder.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeBuilder.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeBuilder.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNodeFactoryOld.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNodeFactoryOld.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNodeFactoryOld.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeNodeFactoryOld.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeParameters.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeParameters.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeParameters.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeParameters.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeState.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeState.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeState.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackagingTreeState.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/PackedModuleOutputNode.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackedModuleOutputNode.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/PackedModuleOutputNode.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/PackedModuleOutputNode.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/packaging/SelectedPackagingElements.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/SelectedPackagingElements.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/packaging/SelectedPackagingElements.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/packaging/SelectedPackagingElements.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/CopyLibraryDialog.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/CopyLibraryDialog.form
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/CopyLibraryDialog.form
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/CopyLibraryDialog.form
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetTypeConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetTypeConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetTypeConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetTypeConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalLibrariesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalResourcesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalResourcesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalResourcesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/GlobalResourcesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/HistoryAware.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/HistoryAware.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/HistoryAware.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/HistoryAware.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdksConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdksConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/JdksConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdksConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesModifiableModel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesModifiableModel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesModifiableModel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesModifiableModel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibraryConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleGroupConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleGroupConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleGroupConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleGroupConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModulesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModulesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ModulesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModulesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectJdksModel.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectLibrariesConfigurable.java
diff --git a/source/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java
similarity index 100%
rename from source/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java
rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java
diff --git a/source/com/intellij/peer/impl/PeerFactoryImpl.java b/java/idea-ui/src/com/intellij/peer/impl/PeerFactoryImpl.java
similarity index 100%
rename from source/com/intellij/peer/impl/PeerFactoryImpl.java
rename to java/idea-ui/src/com/intellij/peer/impl/PeerFactoryImpl.java
diff --git a/source/com/intellij/projectImport/ImportChooserStep.java b/java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java
similarity index 100%
rename from source/com/intellij/projectImport/ImportChooserStep.java
rename to java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java
diff --git a/source/com/intellij/projectImport/ProjectFormatPanel.form b/java/idea-ui/src/com/intellij/projectImport/ProjectFormatPanel.form
similarity index 100%
rename from source/com/intellij/projectImport/ProjectFormatPanel.form
rename to java/idea-ui/src/com/intellij/projectImport/ProjectFormatPanel.form
diff --git a/source/com/intellij/projectImport/ProjectFormatPanel.java b/java/idea-ui/src/com/intellij/projectImport/ProjectFormatPanel.java
similarity index 100%
rename from source/com/intellij/projectImport/ProjectFormatPanel.java
rename to java/idea-ui/src/com/intellij/projectImport/ProjectFormatPanel.java
diff --git a/source/com/intellij/projectImport/ProjectImportBuilder.java b/java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java
similarity index 100%
rename from source/com/intellij/projectImport/ProjectImportBuilder.java
rename to java/idea-ui/src/com/intellij/projectImport/ProjectImportBuilder.java
diff --git a/source/com/intellij/projectImport/ProjectImportProvider.java b/java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java
similarity index 100%
rename from source/com/intellij/projectImport/ProjectImportProvider.java
rename to java/idea-ui/src/com/intellij/projectImport/ProjectImportProvider.java
diff --git a/source/com/intellij/projectImport/ProjectImportWizardStep.java b/java/idea-ui/src/com/intellij/projectImport/ProjectImportWizardStep.java
similarity index 100%
rename from source/com/intellij/projectImport/ProjectImportWizardStep.java
rename to java/idea-ui/src/com/intellij/projectImport/ProjectImportWizardStep.java
diff --git a/source/com/intellij/projectImport/ProjectOpenProcessorBase.java b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
similarity index 100%
rename from source/com/intellij/projectImport/ProjectOpenProcessorBase.java
rename to java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
diff --git a/source/com/intellij/projectImport/SelectImportedProjectsStep.java b/java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java
similarity index 100%
rename from source/com/intellij/projectImport/SelectImportedProjectsStep.java
rename to java/idea-ui/src/com/intellij/projectImport/SelectImportedProjectsStep.java
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index d490b08d1e6f..fc4dbcdbdc81 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -19,6 +19,8 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="idea_rt" />
+    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="compiler-openapi" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java
index 2af9b5317de7..fe287597ab7b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java
@@ -18,7 +18,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.ui.ProjectSettingsService;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java
index eab14515aec7..cc8407cd40ac 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.ProjectSettingsService;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
index 603e90a542e9..75f5b823766c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
@@ -22,8 +22,8 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.libraries.Library;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.ui.ProjectSettingsService;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
diff --git a/source/com/intellij/ide/JavaFileIconPatcher.java b/java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
similarity index 100%
rename from source/com/intellij/ide/JavaFileIconPatcher.java
rename to java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
diff --git a/source/com/intellij/ide/JavaFilePasteProvider.java b/java/java-impl/src/com/intellij/ide/JavaFilePasteProvider.java
similarity index 100%
rename from source/com/intellij/ide/JavaFilePasteProvider.java
rename to java/java-impl/src/com/intellij/ide/JavaFilePasteProvider.java
diff --git a/source/com/intellij/ide/actions/CreateClassAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/CreateClassAction.java
rename to java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
diff --git a/source/com/intellij/ide/actions/CreateTemplateInPackageAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
similarity index 100%
rename from source/com/intellij/ide/actions/CreateTemplateInPackageAction.java
rename to java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
diff --git a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java
index d60ba85095ad..0d38f8461282 100644
--- a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java
+++ b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java
@@ -12,8 +12,8 @@ import com.intellij.openapi.roots.ModulePackageIndex;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.configuration.CommonContentEntriesEditor;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.ui.ProjectSettingsService;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
diff --git a/source/com/intellij/javadoc/GenerateJavadocDialog.java b/java/java-impl/src/com/intellij/javadoc/GenerateJavadocDialog.java
similarity index 100%
rename from source/com/intellij/javadoc/GenerateJavadocDialog.java
rename to java/java-impl/src/com/intellij/javadoc/GenerateJavadocDialog.java
diff --git a/source/com/intellij/javadoc/JavaDocGeneration.form b/java/java-impl/src/com/intellij/javadoc/JavaDocGeneration.form
similarity index 100%
rename from source/com/intellij/javadoc/JavaDocGeneration.form
rename to java/java-impl/src/com/intellij/javadoc/JavaDocGeneration.form
diff --git a/source/com/intellij/javadoc/JavadocBundle.java b/java/java-impl/src/com/intellij/javadoc/JavadocBundle.java
similarity index 100%
rename from source/com/intellij/javadoc/JavadocBundle.java
rename to java/java-impl/src/com/intellij/javadoc/JavadocBundle.java
diff --git a/source/com/intellij/javadoc/JavadocConfigurable.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java
similarity index 100%
rename from source/com/intellij/javadoc/JavadocConfigurable.java
rename to java/java-impl/src/com/intellij/javadoc/JavadocConfigurable.java
diff --git a/source/com/intellij/javadoc/JavadocConfiguration.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
similarity index 100%
rename from source/com/intellij/javadoc/JavadocConfiguration.java
rename to java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
diff --git a/source/com/intellij/javadoc/JavadocGenerationManager.java b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
similarity index 100%
rename from source/com/intellij/javadoc/JavadocGenerationManager.java
rename to java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
diff --git a/source/com/intellij/javadoc/JavadocGenerationPanel.java b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationPanel.java
similarity index 100%
rename from source/com/intellij/javadoc/JavadocGenerationPanel.java
rename to java/java-impl/src/com/intellij/javadoc/JavadocGenerationPanel.java
diff --git a/source/com/intellij/javadoc/actions/GenerateJavadocAction.java b/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
similarity index 100%
rename from source/com/intellij/javadoc/actions/GenerateJavadocAction.java
rename to java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
diff --git a/source/com/intellij/openapi/fileTypes/impl/DefaultFileTypeFactory.java b/java/java-impl/src/com/intellij/openapi/fileTypes/impl/DefaultFileTypeFactory.java
similarity index 100%
rename from source/com/intellij/openapi/fileTypes/impl/DefaultFileTypeFactory.java
rename to java/java-impl/src/com/intellij/openapi/fileTypes/impl/DefaultFileTypeFactory.java
diff --git a/source/com/intellij/ide/IconUtilEx.java b/java/openapi/src/com/intellij/ide/IconUtilEx.java
similarity index 100%
rename from source/com/intellij/ide/IconUtilEx.java
rename to java/openapi/src/com/intellij/ide/IconUtilEx.java
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java
index 4bdda31d128c..8a0b321d6cbd 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java
@@ -5,6 +5,7 @@ import com.intellij.ide.projectView.impl.nodes.NamedLibraryElement;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.projectRoots.Sdk;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -30,4 +31,11 @@ public class ProjectSettingsService {
   public boolean processModulesMoved(final Module[] modules, @Nullable final ModuleGroup targetGroup) {
     return false;
   }
+
+  public void showModuleConfigurationDialog(@Nullable String moduleToSelect, @Nullable String tabNameToSelect, boolean showModuleWizard) {
+  }
+
+  public Sdk chooseAndSetSdk() {
+    return null;
+  }
 }
diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index 08ff3007cdc8..a5470b9bfd95 100644
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="properties" />
     <orderEntry type="module" module-name="execution-openapi" />
+    <orderEntry type="module" module-name="idea-ui" />
   </component>
   <component name="copyright">
     <Base>