diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9862659a73cc..65f437adeeda 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,363 +1,363 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ModuleRenamingHistory">
-    <module old-name="groovy-uast-tests" new-name="intellij.groovy.uast.tests" />
-    <module old-name="jps-builders" new-name="intellij.platform.jps.build" />
-    <module old-name="protocol-reader" new-name="intellij.javascript.protocolReader" />
-    <module old-name="cucumber-jvm-formatter" new-name="intellij.cucumber.jvmFormatter" />
-    <module old-name="git4idea-rt" new-name="intellij.vcs.git.rt" />
-    <module old-name="gradle-tooling-extension-impl" new-name="intellij.gradle.toolingExtension.impl" />
-    <module old-name="cvs-plugin" new-name="intellij.vcs.cvs" />
-    <module old-name="projectModel-api" new-name="intellij.platform.projectModel" />
-    <module old-name="structuralsearch-tests" new-name="intellij.platform.structuralSearch.tests" />
-    <module old-name="annotations-java8" new-name="intellij.platform.annotations" />
-    <module old-name="android-rt" new-name="intellij.android.rt" />
-    <module old-name="java-decompiler-engine" new-name="intellij.java.decompiler.engine" />
-    <module old-name="main_pycharm_ce" new-name="intellij.pycharm.community.main" />
-    <module old-name="platform-resources" new-name="intellij.platform.resources" />
-    <module old-name="svn4idea" new-name="intellij.vcs.svn" />
-    <module old-name="remote-servers-git-java" new-name="intellij.java.remoteServers.git" />
-    <module old-name="RegExpSupport" new-name="intellij.regexp" />
-    <module old-name="dependencies" new-name="intellij.tools.dependencies" />
-    <module old-name="profilers" new-name="intellij.android.profilers" />
-    <module old-name="wizard-model" new-name="intellij.android.wizard.model" />
+    <module old-name="ByteCodeViewer" new-name="intellij.java.byteCodeViewer" />
     <module old-name="IntelliLang" new-name="intellij.platform.langInjection" />
-    <module old-name="adt-branding" new-name="intellij.android.adt.branding" />
-    <module old-name="json-tests" new-name="intellij.json.tests" />
-    <module old-name="resources" new-name="intellij.java.resources" />
-    <module old-name="java-structure-view" new-name="intellij.java.structureView" />
-    <module old-name="jps-standalone-builder" new-name="intellij.tools.jps.build.standalone" />
-    <module old-name="layoutlib-api" new-name="android.sdktools.layoutlib-api" />
-    <module old-name="editor-ui-api" new-name="intellij.platform.editor" />
-    <module old-name="java-indexing-api" new-name="intellij.java.indexing" />
-    <module old-name="adt-ui" new-name="intellij.android.adt.ui" />
-    <module old-name="maven-artifact-resolver-m2" new-name="intellij.maven.artifactResolver.m2" />
-    <module old-name="maven-artifact-resolver-m3" new-name="intellij.maven.artifactResolver.m3" />
-    <module old-name="IntelliLang-tests" new-name="intellij.platform.langInjection.tests" />
-    <module old-name="gradle-jps-plugin" new-name="intellij.gradle.jps" />
-    <module old-name="gradle-tooling-extension-api" new-name="intellij.gradle.toolingExtension" />
-    <module old-name="android-test-framework" new-name="intellij.android.testFramework" />
+    <module old-name="IntelliLang-java" new-name="intellij.java.langInjection" />
     <module old-name="IntelliLang-python" new-name="intellij.python.langInjection" />
-    <module old-name="xslt-debugger-engine" new-name="intellij.xslt.debugger.engine" />
-    <module old-name="python-terminal" new-name="intellij.python.terminal" />
-    <module old-name="maven-artifact-resolver-common" new-name="intellij.maven.artifactResolver.common" />
-    <module old-name="gradle" new-name="intellij.gradle" />
-    <module old-name="python-helpers" new-name="intellij.python.helpers" />
-    <module old-name="svn4idea-tests" new-name="intellij.vcs.svn.tests" />
-    <module old-name="built-in-server-api" new-name="intellij.platform.builtInServer" />
-    <module old-name="analysis-impl" new-name="intellij.platform.analysis.impl" />
-    <module old-name="coverage_rt" new-name="intellij.java.coverage.rt" />
-    <module old-name="structuralsearch-java" new-name="intellij.java.structuralSearch" />
-    <module old-name="eclipse-jps-plugin" new-name="intellij.eclipse.jps" />
-    <module old-name="gradle-api-deps" new-name="intellij.tools.dependencies.gradle" />
-    <module old-name="designer" new-name="intellij.android.designer" />
-    <module old-name="python-community-plugin-resources" new-name="intellij.python.community.plugin.resources" />
-    <module old-name="maven-jps-plugin" new-name="intellij.maven.jps" />
-    <module old-name="java-analysis-api" new-name="intellij.java.analysis" />
-    <module old-name="common" new-name="android.sdktools.common" />
-    <module old-name="java-i18n" new-name="intellij.java.i18n" />
-    <module old-name="compiler-tests" new-name="intellij.java.compiler.tests" />
-    <module old-name="javaFX-CE" new-name="intellij.javaFX.community" />
-    <module old-name="community-main" new-name="intellij.idea.community.main" />
-    <module old-name="stream-debugger" new-name="intellij.java.debugger.streams" />
-    <module old-name="jsp-openapi" new-name="intellij.jsp" />
-    <module old-name="execution-openapi" new-name="intellij.java.execution" />
-    <module old-name="python-community-tools" new-name="intellij.python.tools" />
-    <module old-name="java-analysis-impl" new-name="intellij.java.analysis.impl" />
-    <module old-name="python-psi-api" new-name="intellij.python.psi" />
-    <module old-name="settings-repository-tests" new-name="intellij.settingsRepository.tests" />
-    <module old-name="xpath" new-name="intellij.xpath" />
-    <module old-name="dvcs-impl" new-name="intellij.platform.vcs.dvcs.impl" />
-    <module old-name="ui-designer" new-name="intellij.java.guiForms.designer" />
-    <module old-name="debugger-openapi" new-name="intellij.java.debugger" />
-    <module old-name="boot" new-name="intellij.platform.boot" />
-    <module old-name="xslt-rt" new-name="intellij.xslt.debugger.rt" />
-    <module old-name="perflib" new-name="android.sdktools.perflib" />
-    <module old-name="python-community-plugin-minor" new-name="intellij.python.community.plugin.minor" />
-    <module old-name="instrumentation-util-8" new-name="intellij.java.compiler.instrumentationUtil.java8" />
-    <module old-name="xml-structure-view-impl" new-name="intellij.xml.structureView.impl" />
-    <module old-name="java-indexing-impl" new-name="intellij.java.indexing.impl" />
+    <module old-name="IntelliLang-tests" new-name="intellij.platform.langInjection.tests" />
+    <module old-name="IntelliLang-xml" new-name="intellij.xml.langInjection" />
+    <module old-name="RegExpSupport" new-name="intellij.regexp" />
     <module old-name="ShortcutPromoter" new-name="intellij.shortcutPromoter" />
-    <module old-name="github" new-name="intellij.vcs.github" />
-    <module old-name="instrumentation-util" new-name="intellij.java.compiler.instrumentationUtil" />
-    <module old-name="python-community-ide-resources" new-name="intellij.pycharm.community.resources" />
-    <module old-name="android-tests" new-name="intellij.android.tests" />
-    <module old-name="script-debugger-backend" new-name="intellij.platform.scriptDebugger.backend" />
-    <module old-name="remote-servers-git" new-name="intellij.platform.remoteServers.git" />
-    <module old-name="java-lib-model" new-name="intellij.android.javaLibModel" />
-    <module old-name="commander" new-name="intellij.commander" />
-    <module old-name="properties" new-name="intellij.properties" />
-    <module old-name="repository" new-name="android.sdktools.repository" />
-    <module old-name="groovy-jps-plugin" new-name="intellij.groovy.jps" />
-    <module old-name="ui-designer-jps-plugin" new-name="intellij.java.guiForms.jps" />
-    <module old-name="maven3-server-common" new-name="intellij.maven.server.m3.common" />
-    <module old-name="android" new-name="intellij.android" />
-    <module old-name="structuralsearch-groovy" new-name="intellij.groovy.structuralSearch" />
-    <module old-name="fakeadbserver" new-name="android.sdktools.fakeadbserver" />
-    <module old-name="util-rt" new-name="intellij.platform.util.rt" />
-    <module old-name="debugger-agent" new-name="intellij.java.debugger.agent" />
-    <module old-name="maven30-server-impl" new-name="intellij.maven.server.m30.impl" />
-    <module old-name="idea-ui" new-name="intellij.java.ui" />
-    <module old-name="intellilang-jps-plugin" new-name="intellij.java.langInjection.jps" />
-    <module old-name="observable" new-name="intellij.android.observable" />
-    <module old-name="eclipse" new-name="intellij.eclipse" />
-    <module old-name="python-community-plugin-java" new-name="intellij.python.community.plugin.java" />
-    <module old-name="layoutlib" new-name="android.sdktools.layoutlib" />
-    <module old-name="properties-psi-impl" new-name="intellij.properties.psi.impl" />
-    <module old-name="smali" new-name="intellij.android.smali" />
-    <module old-name="ant-jps-plugin" new-name="intellij.ant.jps" />
-    <module old-name="stats-collector" new-name="intellij.statsCollector" />
-    <module old-name="annotations" new-name="intellij.platform.annotations.java5" />
-    <module old-name="dom-impl" new-name="intellij.xml.dom.impl" />
-    <module old-name="groovy_rt" new-name="intellij.groovy.rt" />
-    <module old-name="structuralsearch" new-name="intellij.platform.structuralSearch" />
-    <module old-name="typeMigration" new-name="intellij.java.typeMigration" />
-    <module old-name="manifest-merger" new-name="android.sdktools.manifest-merger" />
-    <module old-name="platform-build-scripts" new-name="intellij.platform.buildScripts" />
-    <module old-name="javaFX" new-name="intellij.javaFX" />
-    <module old-name="terminal" new-name="intellij.terminal" />
-    <module old-name="analytics-testing" new-name="android.sdktools.analytics-testing" />
+    <module old-name="adt-branding" new-name="intellij.android.adt.branding" />
+    <module old-name="adt-ui" new-name="intellij.android.adt.ui" />
     <module old-name="adt-ui-model" new-name="intellij.android.adt.ui.model" />
-    <module old-name="instant-run-common" new-name="android.sdktools.instant-run-common" />
-    <module old-name="icons" new-name="intellij.platform.icons" />
-    <module old-name="rest" new-name="intellij.reStructuredText" />
-    <module old-name="android-common" new-name="intellij.android.common" />
-    <module old-name="jps-model-tests" new-name="intellij.platform.jps.model.tests" />
-    <module old-name="xdebugger-impl" new-name="intellij.platform.debugger.impl" />
-    <module old-name="core-api" new-name="intellij.platform.core" />
-    <module old-name="testExtensions" new-name="intellij.platform.testExtensions" />
-    <module old-name="jetCheck" new-name="intellij.tools.jetCheck" />
-    <module old-name="xml-analysis-impl" new-name="intellij.xml.analysis.impl" />
-    <module old-name="java-decompiler-plugin" new-name="intellij.java.decompiler" />
-    <module old-name="python-pydev" new-name="intellij.python.pydev" />
-    <module old-name="jps-model-api" new-name="intellij.platform.jps.model" />
-    <module old-name="json" new-name="intellij.json" />
-    <module old-name="jetgroovy" new-name="intellij.groovy" />
-    <module old-name="junit_rt" new-name="intellij.junit.rt" />
-    <module old-name="chunkio" new-name="android.sdktools.chunkio" />
-    <module old-name="android-plugin" new-name="intellij.android.plugin" />
-    <module old-name="xml-psi-api" new-name="intellij.xml.psi" />
-    <module old-name="ui-designer-core" new-name="intellij.uiDesigner" />
-    <module old-name="maven-artifact-resolver-m31" new-name="intellij.maven.artifactResolver.m31" />
-    <module old-name="artwork" new-name="intellij.android.artwork" />
-    <module old-name="jsp-base-openapi" new-name="intellij.jsp.base" />
-    <module old-name="smartcvs-src" new-name="intellij.vcs.cvs.smartcvs" />
-    <module old-name="sdklib" new-name="android.sdktools.sdklib" />
-    <module old-name="lvcs-api" new-name="intellij.platform.lvcs" />
-    <module old-name="java-tests" new-name="intellij.java.tests" />
-    <module old-name="layoutinspector" new-name="intellij.android.layoutInspector" />
-    <module old-name="build-debug-binaries" new-name="intellij.pycharm.community.build.debugBinaries" />
-    <module old-name="build-common" new-name="intellij.android.buildCommon" />
-    <module old-name="java-runtime" new-name="intellij.java.rt" />
-    <module old-name="python-edu-build" new-name="intellij.pycharm.edu.build" />
-    <module old-name="external-system-rt" new-name="intellij.platform.externalSystem.rt" />
-    <module old-name="indexing-api" new-name="intellij.platform.indexing" />
-    <module old-name="tasks-core" new-name="intellij.tasks.core" />
+    <module old-name="aether-dependency-resolver" new-name="intellij.java.aetherDependencyResolver" />
+    <module old-name="analysis-api" new-name="intellij.platform.analysis" />
+    <module old-name="analysis-impl" new-name="intellij.platform.analysis.impl" />
+    <module old-name="analytics-testing" new-name="android.sdktools.analytics-testing" />
+    <module old-name="analyzer" new-name="intellij.android.analyzer" />
+    <module old-name="android" new-name="intellij.android" />
     <module old-name="android-annotations" new-name="android.sdktools.android-annotations" />
-    <module old-name="draw9patch" new-name="android.sdktools.draw9patch" />
-    <module old-name="pycharm-edu-dependencies" new-name="intellij.pycharm.edu.dependencies" />
-    <module old-name="projectModel-impl" new-name="intellij.platform.projectModel.impl" />
+    <module old-name="android-common" new-name="intellij.android.common" />
+    <module old-name="android-gradle-jps" new-name="intellij.android.gradle.jps" />
+    <module old-name="android-jps-plugin" new-name="intellij.android.jps" />
+    <module old-name="android-plugin" new-name="intellij.android.plugin" />
+    <module old-name="android-rt" new-name="intellij.android.rt" />
+    <module old-name="android-test-framework" new-name="intellij.android.testFramework" />
+    <module old-name="android-tests" new-name="intellij.android.tests" />
+    <module old-name="android-uitests" new-name="intellij.android.guiTests" />
+    <module old-name="android-ultimate" new-name="intellij.android.ultimate" />
+    <module old-name="annotations" new-name="intellij.platform.annotations.java5" />
+    <module old-name="annotations-common" new-name="intellij.platform.annotations.common" />
+    <module old-name="annotations-java8" new-name="intellij.platform.annotations" />
+    <module old-name="ant" new-name="intellij.ant" />
+    <module old-name="ant-jps-plugin" new-name="intellij.ant.jps" />
+    <module old-name="antlayout" new-name="intellij.tools.jps.antTasks" />
+    <module old-name="appEngine-runtime" new-name="intellij.java.googleAppEngine.runtime" />
+    <module old-name="artwork" new-name="intellij.android.artwork" />
+    <module old-name="binary-resources" new-name="android.sdktools.binary-resources" />
+    <module old-name="boot" new-name="intellij.platform.boot" />
     <module old-name="bootstrap" new-name="intellij.platform.bootstrap" />
-    <module old-name="git4idea" new-name="intellij.vcs.git" />
-    <module old-name="remote-servers-java-api" new-name="intellij.java.remoteServers" />
-    <module old-name="maven" new-name="intellij.maven" />
-    <module old-name="maven-server-api" new-name="intellij.maven.server" />
-    <module old-name="resources-en" new-name="intellij.java.resources.en" />
+    <module old-name="build" new-name="intellij.idea.community.build" />
+    <module old-name="build-common" new-name="intellij.android.buildCommon" />
+    <module old-name="build-debug-binaries" new-name="intellij.pycharm.community.build.debugBinaries" />
+    <module old-name="buildScripts-testFramework" new-name="intellij.platform.buildScripts.testFramework" />
+    <module old-name="builder-model" new-name="android.sdktools.builder-model" />
+    <module old-name="builder-test-api" new-name="android.sdktools.builder-test-api" />
+    <module old-name="built-in-server" new-name="intellij.platform.builtInServer.impl" />
+    <module old-name="built-in-server-api" new-name="intellij.platform.builtInServer" />
+    <module old-name="built-in-server-tests" new-name="intellij.platform.builtInServer.tests" />
+    <module old-name="chunkio" new-name="android.sdktools.chunkio" />
+    <module old-name="chunkio-processor" new-name="android.sdktools.chunkio-processor" />
     <module old-name="colorSchemes" new-name="intellij.platform.colorSchemes" />
+    <module old-name="commander" new-name="intellij.commander" />
+    <module old-name="common" new-name="android.sdktools.common" />
+    <module old-name="common-eclipse-util" new-name="intellij.eclipse.common" />
     <module old-name="common-javaFX-plugin" new-name="intellij.javaFX.common" />
-    <module old-name="spellchecker" new-name="intellij.spellchecker" />
-    <module old-name="tasks-platform-api" new-name="intellij.platform.tasks" />
+    <module old-name="community-guitests" new-name="intellij.idea.community.guiTests" />
+    <module old-name="community-main" new-name="intellij.idea.community.main" />
+    <module old-name="community-resources" new-name="intellij.idea.community.resources" />
+    <module old-name="compiler-impl" new-name="intellij.java.compiler.impl" />
+    <module old-name="compiler-openapi" new-name="intellij.java.compiler" />
+    <module old-name="compiler-tests" new-name="intellij.java.compiler.tests" />
+    <module old-name="configuration-store-impl" new-name="intellij.platform.configurationStore.impl" />
+    <module old-name="copyright" new-name="intellij.copyright" />
+    <module old-name="core-api" new-name="intellij.platform.core" />
+    <module old-name="core-impl" new-name="intellij.platform.core.impl" />
+    <module old-name="coverage" new-name="intellij.java.coverage" />
+    <module old-name="coverage-common" new-name="intellij.platform.coverage" />
+    <module old-name="coverage_rt" new-name="intellij.java.coverage.rt" />
+    <module old-name="credential-store" new-name="intellij.platform.credentialStore" />
+    <module old-name="cucumber-jvm-formatter" new-name="intellij.cucumber.jvmFormatter" />
+    <module old-name="cucumber-test-runner" new-name="intellij.cucumber.testRunner" />
+    <module old-name="cvs-core" new-name="intellij.vcs.cvs.core" />
+    <module old-name="cvs-plugin" new-name="intellij.vcs.cvs" />
+    <module old-name="ddmlib" new-name="android.sdktools.ddmlib" />
+    <module old-name="debugger-agent" new-name="intellij.java.debugger.agent" />
+    <module old-name="debugger-agent-storage" new-name="intellij.java.debugger.agent.storage" />
+    <module old-name="debugger-impl" new-name="intellij.java.debugger.impl" />
+    <module old-name="debugger-openapi" new-name="intellij.java.debugger" />
+    <module old-name="dependencies" new-name="intellij.tools.dependencies" />
+    <module old-name="designer" new-name="intellij.android.designer" />
+    <module old-name="designer-tests" new-name="intellij.android.designer.tests" />
+    <module old-name="devkit" new-name="intellij.devkit" />
+    <module old-name="devkit-jps-plugin" new-name="intellij.devkit.jps" />
+    <module old-name="devkit-kotlin-tests" new-name="intellij.devkit.kotlin.tests" />
+    <module old-name="diff-api" new-name="intellij.platform.diff" />
+    <module old-name="diff-impl" new-name="intellij.platform.diff.impl" />
+    <module old-name="diff-tests" new-name="intellij.platform.diff.tests" />
+    <module old-name="dom-impl" new-name="intellij.xml.dom.impl" />
     <module old-name="dom-openapi" new-name="intellij.xml.dom" />
-    <module old-name="testGuiFramework" new-name="intellij.platform.testGuiFramework" />
+    <module old-name="dom-tests" new-name="intellij.xml.dom.tests" />
+    <module old-name="draw9patch" new-name="android.sdktools.draw9patch" />
+    <module old-name="duplicates-analysis" new-name="intellij.platform.duplicates.analysis" />
+    <module old-name="dvcs-api" new-name="intellij.platform.vcs.dvcs" />
+    <module old-name="dvcs-impl" new-name="intellij.platform.vcs.dvcs.impl" />
+    <module old-name="dvlib" new-name="android.sdktools.dvlib" />
+    <module old-name="eclipse" new-name="intellij.eclipse" />
+    <module old-name="eclipse-jps-plugin" new-name="intellij.eclipse.jps" />
+    <module old-name="editor-ui-api" new-name="intellij.platform.editor" />
+    <module old-name="editor-ui-ex" new-name="intellij.platform.editor.ex" />
+    <module old-name="editorconfig" new-name="intellij.editorconfig" />
+    <module old-name="educational-python" new-name="intellij.pycharm.edu" />
+    <module old-name="execution-impl" new-name="intellij.java.execution.impl" />
+    <module old-name="execution-openapi" new-name="intellij.java.execution" />
+    <module old-name="extensions" new-name="intellij.platform.extensions" />
+    <module old-name="external-system-api" new-name="intellij.platform.externalSystem" />
+    <module old-name="external-system-impl" new-name="intellij.platform.externalSystem.impl" />
+    <module old-name="external-system-rt" new-name="intellij.platform.externalSystem.rt" />
+    <module old-name="fakeadbserver" new-name="android.sdktools.fakeadbserver" />
+    <module old-name="flags" new-name="intellij.android.flags" />
+    <module old-name="forms-compiler" new-name="intellij.java.guiForms.compiler" />
+    <module old-name="forms_rt" new-name="intellij.java.guiForms.rt" />
+    <module old-name="git4idea" new-name="intellij.vcs.git" />
+    <module old-name="git4idea-rt" new-name="intellij.vcs.git.rt" />
+    <module old-name="github" new-name="intellij.vcs.github" />
+    <module old-name="google-app-engine" new-name="intellij.java.googleAppEngine" />
+    <module old-name="google-app-engine-jps-plugin" new-name="intellij.java.googleAppEngine.jps" />
+    <module old-name="gradle" new-name="intellij.gradle" />
+    <module old-name="gradle-api-deps" new-name="intellij.tools.dependencies.gradle" />
+    <module old-name="gradle-jps-plugin" new-name="intellij.gradle.jps" />
+    <module old-name="gradle-tests" new-name="intellij.gradle.tests" />
+    <module old-name="gradle-tooling-extension-api" new-name="intellij.gradle.toolingExtension" />
+    <module old-name="gradle-tooling-extension-impl" new-name="intellij.gradle.toolingExtension.impl" />
+    <module old-name="gradle-tooling-extension-tests" new-name="intellij.gradle.toolingExtension.tests" />
+    <module old-name="groovy-jps-plugin" new-name="intellij.groovy.jps" />
+    <module old-name="groovy-psi" new-name="intellij.groovy.psi" />
+    <module old-name="groovy-rt-constants" new-name="intellij.groovy.constants.rt" />
+    <module old-name="groovy-uast-tests" new-name="intellij.groovy.uast.tests" />
+    <module old-name="groovy_rt" new-name="intellij.groovy.rt" />
+    <module old-name="hg4idea" new-name="intellij.vcs.hg" />
+    <module old-name="icons" new-name="intellij.platform.icons" />
+    <module old-name="idea-ui" new-name="intellij.java.ui" />
+    <module old-name="idea-ui-tests" new-name="intellij.java.ui.tests" />
+    <module old-name="images" new-name="intellij.platform.images" />
+    <module old-name="images-build-scripts" new-name="intellij.platform.images.build" />
+    <module old-name="index-tools" new-name="intellij.tools.index" />
+    <module old-name="indexing-api" new-name="intellij.platform.indexing" />
+    <module old-name="indexing-impl" new-name="intellij.platform.indexing.impl" />
+    <module old-name="instant-run-annotations" new-name="android.sdktools.instant-run-annotations" />
+    <module old-name="instant-run-client" new-name="android.sdktools.instant-run-client" />
+    <module old-name="instant-run-common" new-name="android.sdktools.instant-run-common" />
+    <module old-name="instant-run-runtime" new-name="android.sdktools.instant-run-runtime" />
+    <module old-name="instrumentation-util" new-name="intellij.java.compiler.instrumentationUtil" />
+    <module old-name="instrumentation-util-8" new-name="intellij.java.compiler.instrumentationUtil.java8" />
+    <module old-name="intellilang-jps-plugin" new-name="intellij.java.langInjection.jps" />
+    <module old-name="ipnb" new-name="intellij.python.ipnb" />
+    <module old-name="java-analysis-api" new-name="intellij.java.analysis" />
+    <module old-name="java-analysis-impl" new-name="intellij.java.analysis.impl" />
+    <module old-name="java-decompiler-engine" new-name="intellij.java.decompiler.engine" />
+    <module old-name="java-decompiler-plugin" new-name="intellij.java.decompiler" />
+    <module old-name="java-i18n" new-name="intellij.java.i18n" />
+    <module old-name="java-impl" new-name="intellij.java.impl" />
+    <module old-name="java-indexing-api" new-name="intellij.java.indexing" />
+    <module old-name="java-indexing-impl" new-name="intellij.java.indexing.impl" />
+    <module old-name="java-lib-model" new-name="intellij.android.javaLibModel" />
+    <module old-name="java-lib-model-builder" new-name="intellij.android.javaLibModel.builder" />
+    <module old-name="java-psi-api" new-name="intellij.java.psi" />
+    <module old-name="java-psi-impl" new-name="intellij.java.psi.impl" />
+    <module old-name="java-runtime" new-name="intellij.java.rt" />
+    <module old-name="java-structure-view" new-name="intellij.java.structureView" />
+    <module old-name="java-tests" new-name="intellij.java.tests" />
+    <module old-name="javaFX" new-name="intellij.javaFX" />
+    <module old-name="javaFX-CE" new-name="intellij.javaFX.community" />
+    <module old-name="javaFX-jps-plugin" new-name="intellij.javaFX.jps" />
+    <module old-name="javac-ref-scanner-8" new-name="intellij.java.jps.javacRefScanner8" />
+    <module old-name="javac2" new-name="intellij.java.compiler.antTasks" />
+    <module old-name="javacvs-src" new-name="intellij.vcs.cvs.javacvs" />
+    <module old-name="jetCheck" new-name="intellij.tools.jetCheck" />
+    <module old-name="jetgroovy" new-name="intellij.groovy" />
+    <module old-name="jira" new-name="intellij.tasks.jira" />
+    <module old-name="jps-builders" new-name="intellij.platform.jps.build" />
+    <module old-name="jps-builders-6" new-name="intellij.platform.jps.build.javac.rt" />
+    <module old-name="jps-launcher" new-name="intellij.platform.jps.build.launcher" />
+    <module old-name="jps-model-api" new-name="intellij.platform.jps.model" />
+    <module old-name="jps-model-impl" new-name="intellij.platform.jps.model.impl" />
+    <module old-name="jps-model-serialization" new-name="intellij.platform.jps.model.serialization" />
+    <module old-name="jps-model-tests" new-name="intellij.platform.jps.model.tests" />
+    <module old-name="jps-serialization-tests" new-name="intellij.platform.jps.model.serialization.tests" />
+    <module old-name="jps-standalone-builder" new-name="intellij.tools.jps.build.standalone" />
+    <module old-name="jshell-frontend" new-name="intellij.java.jshell.frontend" />
+    <module old-name="jshell-protocol" new-name="intellij.java.jshell.protocol" />
+    <module old-name="json" new-name="intellij.json" />
+    <module old-name="json-tests" new-name="intellij.json.tests" />
+    <module old-name="jsp-base-openapi" new-name="intellij.jsp.base" />
+    <module old-name="jsp-openapi" new-name="intellij.jsp" />
+    <module old-name="jsp-spi" new-name="intellij.jsp.spi" />
+    <module old-name="junit" new-name="intellij.junit" />
+    <module old-name="junit5_rt" new-name="intellij.junit.v5.rt" />
+    <module old-name="junit5_rt_tests" new-name="intellij.junit.v5.rt.tests" />
+    <module old-name="junit_rt" new-name="intellij.junit.rt" />
+    <module old-name="lang-api" new-name="intellij.platform.lang" />
+    <module old-name="lang-impl" new-name="intellij.platform.lang.impl" />
+    <module old-name="lang-tests" new-name="intellij.platform.lang.tests" />
+    <module old-name="layoutinspector" new-name="intellij.android.layoutInspector" />
+    <module old-name="layoutlib" new-name="android.sdktools.layoutlib" />
+    <module old-name="layoutlib-api" new-name="android.sdktools.layoutlib-api" />
+    <module old-name="layoutlib-resources" new-name="android.sdktools.layoutlib-resources" />
+    <module old-name="lint-api" new-name="android.sdktools.lint-api" />
     <module old-name="lint-checks" new-name="android.sdktools.lint-checks" />
     <module old-name="log-events" new-name="intellij.statsCollector.logEvents" />
-    <module old-name="xml-structure-view-api" new-name="intellij.xml.structureView" />
-    <module old-name="ant" new-name="intellij.ant" />
-    <module old-name="java-psi-api" new-name="intellij.java.psi" />
-    <module old-name="xslt-debugger-engine-impl" new-name="intellij.xslt.debugger.engine.impl" />
-    <module old-name="credential-store" new-name="intellij.platform.credentialStore" />
-    <module old-name="hg4idea" new-name="intellij.vcs.hg" />
-    <module old-name="settings-repository" new-name="intellij.settingsRepository" />
-    <module old-name="common-eclipse-util" new-name="intellij.eclipse.common" />
-    <module old-name="tasks-platform-impl" new-name="intellij.platform.tasks.impl" />
-    <module old-name="images" new-name="intellij.platform.images" />
-    <module old-name="core-impl" new-name="intellij.platform.core.impl" />
-    <module old-name="javac-ref-scanner-8" new-name="intellij.java.jps.javacRefScanner8" />
-    <module old-name="instant-run-runtime" new-name="android.sdktools.instant-run-runtime" />
-    <module old-name="xdebugger-api" new-name="intellij.platform.debugger" />
-    <module old-name="relaxng" new-name="intellij.relaxng" />
-    <module old-name="vcs-log-api" new-name="intellij.platform.vcs.log" />
-    <module old-name="gradle-tooling-extension-tests" new-name="intellij.gradle.toolingExtension.tests" />
-    <module old-name="binary-resources" new-name="android.sdktools.binary-resources" />
-    <module old-name="IntelliLang-xml" new-name="intellij.xml.langInjection" />
-    <module old-name="update-server-mock" new-name="intellij.tools.updateServerMock" />
-    <module old-name="jps-builders-6" new-name="intellij.platform.jps.build.javac.rt" />
-    <module old-name="instant-run-annotations" new-name="android.sdktools.instant-run-annotations" />
+    <module old-name="lvcs-api" new-name="intellij.platform.lvcs" />
     <module old-name="lvcs-impl" new-name="intellij.platform.lvcs.impl" />
-    <module old-name="python-community-ide" new-name="intellij.pycharm.community" />
-    <module old-name="builder-model" new-name="android.sdktools.builder-model" />
-    <module old-name="idea-ui-tests" new-name="intellij.java.ui.tests" />
-    <module old-name="xslt-debugger" new-name="intellij.xslt.debugger" />
-    <module old-name="javacvs-src" new-name="intellij.vcs.cvs.javacvs" />
-    <module old-name="images-build-scripts" new-name="intellij.platform.images.build" />
-    <module old-name="dvcs-api" new-name="intellij.platform.vcs.dvcs" />
-    <module old-name="util" new-name="intellij.platform.util" />
-    <module old-name="forms_rt" new-name="intellij.java.guiForms.rt" />
-    <module old-name="properties-psi-api" new-name="intellij.properties.psi" />
-    <module old-name="jps-model-impl" new-name="intellij.platform.jps.model.impl" />
-    <module old-name="platform-main" new-name="intellij.platform.main" />
-    <module old-name="editorconfig" new-name="intellij.editorconfig" />
-    <module old-name="java-impl" new-name="intellij.java.impl" />
-    <module old-name="lint-api" new-name="android.sdktools.lint-api" />
-    <module old-name="testng" new-name="intellij.testng" />
-    <module old-name="protocol-reader-runtime" new-name="intellij.platform.scriptDebugger.protocolReaderRuntime" />
-    <module old-name="google-app-engine-jps-plugin" new-name="intellij.java.googleAppEngine.jps" />
-    <module old-name="groovy-rt-constants" new-name="intellij.groovy.constants.rt" />
-    <module old-name="IntelliLang-java" new-name="intellij.java.langInjection" />
-    <module old-name="index-tools" new-name="intellij.tools.index" />
-    <module old-name="remote-servers-java-impl" new-name="intellij.java.remoteServers.impl" />
-    <module old-name="testng_rt" new-name="intellij.testng.rt" />
-    <module old-name="uitest-framework" new-name="intellij.android.guiTestFramework" />
-    <module old-name="java-psi-impl" new-name="intellij.java.psi.impl" />
-    <module old-name="annotations-common" new-name="intellij.platform.annotations.common" />
-    <module old-name="python-openapi" new-name="intellij.python.community" />
-    <module old-name="ninepatch" new-name="android.sdktools.ninepatch" />
-    <module old-name="analysis-api" new-name="intellij.platform.analysis" />
-    <module old-name="python-plugin-tests" new-name="intellij.python.community.plugin.tests" />
-    <module old-name="platform-tests" new-name="intellij.platform.tests" />
-    <module old-name="tasks-api" new-name="intellij.tasks" />
-    <module old-name="smRunner" new-name="intellij.platform.smRunner" />
-    <module old-name="aether-dependency-resolver" new-name="intellij.java.aetherDependencyResolver" />
-    <module old-name="analyzer" new-name="intellij.android.analyzer" />
-    <module old-name="node-rpc-client" new-name="intellij.nodeRpcClient" />
-    <module old-name="dom-tests" new-name="intellij.xml.dom.tests" />
-    <module old-name="cucumber-test-runner" new-name="intellij.cucumber.testRunner" />
-    <module old-name="dvlib" new-name="android.sdktools.dvlib" />
-    <module old-name="coverage" new-name="intellij.java.coverage" />
-    <module old-name="protocol-model-generator" new-name="intellij.javascript.protocolModelGenerator" />
-    <module old-name="junit" new-name="intellij.junit" />
-    <module old-name="testFramework" new-name="intellij.platform.testFramework" />
-    <module old-name="xml-tests" new-name="intellij.xml.tests" />
-    <module old-name="jira" new-name="intellij.tasks.jira" />
-    <module old-name="lang-api" new-name="intellij.platform.lang" />
-    <module old-name="observable-ui" new-name="intellij.android.observable.ui" />
-    <module old-name="designer-tests" new-name="intellij.android.designer.tests" />
-    <module old-name="uast-tests" new-name="intellij.platform.uast.tests" />
-    <module old-name="diff-api" new-name="intellij.platform.diff" />
-    <module old-name="diff-tests" new-name="intellij.platform.diff.tests" />
-    <module old-name="ByteCodeViewer" new-name="intellij.java.byteCodeViewer" />
-    <module old-name="testFramework.core" new-name="intellij.platform.testFramework.core" />
-    <module old-name="sdk-updates" new-name="intellij.android.sdkUpdates" />
-    <module old-name="compiler-impl" new-name="intellij.java.compiler.impl" />
-    <module old-name="jps-launcher" new-name="intellij.platform.jps.build.launcher" />
-    <module old-name="devkit" new-name="intellij.devkit" />
-    <module old-name="jshell-protocol" new-name="intellij.java.jshell.protocol" />
-    <module old-name="educational-python" new-name="intellij.pycharm.edu" />
-    <module old-name="openapi" new-name="intellij.java" />
-    <module old-name="chunkio-processor" new-name="android.sdktools.chunkio-processor" />
-    <module old-name="pixelprobe" new-name="android.sdktools.pixelprobe" />
-    <module old-name="xml-analysis-api" new-name="intellij.xml.analysis" />
-    <module old-name="python-community" new-name="intellij.python.community.impl" />
-    <module old-name="instant-run-client" new-name="android.sdktools.instant-run-client" />
-    <module old-name="builder-test-api" new-name="android.sdktools.builder-test-api" />
-    <module old-name="forms-compiler" new-name="intellij.java.guiForms.compiler" />
-    <module old-name="platform-impl" new-name="intellij.platform.ide.impl" />
-    <module old-name="configuration-store-impl" new-name="intellij.platform.configurationStore.impl" />
-    <module old-name="vcs-impl" new-name="intellij.platform.vcs.impl" />
-    <module old-name="remote-servers-agent-rt" new-name="intellij.platform.remoteServers.agent.rt" />
-    <module old-name="sherpa-ui" new-name="intellij.android.sherpaUi" />
-    <module old-name="ddmlib" new-name="android.sdktools.ddmlib" />
-    <module old-name="copyright" new-name="intellij.copyright" />
-    <module old-name="duplicates-analysis" new-name="intellij.platform.duplicates.analysis" />
-    <module old-name="devkit-kotlin-tests" new-name="intellij.devkit.kotlin.tests" />
-    <module old-name="javaFX-jps-plugin" new-name="intellij.javaFX.jps" />
-    <module old-name="util-tests" new-name="intellij.platform.util.tests" />
-    <module old-name="python-community-build" new-name="intellij.pycharm.community.build" />
-    <module old-name="compiler-openapi" new-name="intellij.java.compiler" />
-    <module old-name="debugger-impl" new-name="intellij.java.debugger.impl" />
-    <module old-name="layoutlib-resources" new-name="android.sdktools.layoutlib-resources" />
-    <module old-name="platform-api" new-name="intellij.platform.ide" />
-    <module old-name="buildScripts-testFramework" new-name="intellij.platform.buildScripts.testFramework" />
-    <module old-name="groovy-psi" new-name="intellij.groovy.psi" />
-    <module old-name="external-system-impl" new-name="intellij.platform.externalSystem.impl" />
-    <module old-name="python-rest" new-name="intellij.python.reStructuredText" />
-    <module old-name="python-community-plugin-core" new-name="intellij.python.community.plugin" />
-    <module old-name="tasks-java" new-name="intellij.tasks.java" />
-    <module old-name="usageView" new-name="intellij.platform.usageView" />
-    <module old-name="debugger-agent-storage" new-name="intellij.java.debugger.agent.storage" />
-    <module old-name="cvs-core" new-name="intellij.vcs.cvs.core" />
-    <module old-name="community-guitests" new-name="intellij.idea.community.guiTests" />
-    <module old-name="xml" new-name="intellij.xml.impl" />
-    <module old-name="javac2" new-name="intellij.java.compiler.antTasks" />
-    <module old-name="external-system-api" new-name="intellij.platform.externalSystem" />
-    <module old-name="xml-psi-impl" new-name="intellij.xml.psi.impl" />
-    <module old-name="testutils" new-name="android.sdktools.testutils" />
-    <module old-name="flags" new-name="intellij.android.flags" />
-    <module old-name="uast-java" new-name="intellij.java.uast" />
-    <module old-name="vcs-log-impl" new-name="intellij.platform.vcs.log.impl" />
-    <module old-name="indexing-impl" new-name="intellij.platform.indexing.impl" />
-    <module old-name="python-community-tests" new-name="intellij.python.community.tests" />
-    <module old-name="python-community-plugin-build-patches" new-name="intellij.python.community.plugin.buildPatches" />
-    <module old-name="jsp-spi" new-name="intellij.jsp.spi" />
-    <module old-name="build" new-name="intellij.idea.community.build" />
-    <module old-name="testFramework-java" new-name="intellij.java.testFramework" />
-    <module old-name="vcs-log-graph-api" new-name="intellij.platform.vcs.log.graph" />
-    <module old-name="structure-view-impl" new-name="intellij.platform.structureView.impl" />
-    <module old-name="coverage-common" new-name="intellij.platform.coverage" />
-    <module old-name="appEngine-runtime" new-name="intellij.java.googleAppEngine.runtime" />
-    <module old-name="python-community-configure" new-name="intellij.python.configure" />
-    <module old-name="profilers-ui" new-name="intellij.android.profilers.ui" />
+    <module old-name="main_AndroidStudio" new-name="intellij.androidStudio.main" />
+    <module old-name="main_pycharm_ce" new-name="intellij.pycharm.community.main" />
     <module old-name="main_pycharm_edu" new-name="intellij.pycharm.edu.main" />
-    <module old-name="tests_bootstrap" new-name="intellij.tools.testsBootstrap" />
-    <module old-name="diff-impl" new-name="intellij.platform.diff.impl" />
-    <module old-name="uast-common" new-name="intellij.platform.uast" />
-    <module old-name="android-jps-plugin" new-name="intellij.android.jps" />
-    <module old-name="python-community-plugin" new-name="intellij.python.community.plugin.main" />
-    <module old-name="platform-build-scripts-tests" new-name="intellij.platform.buildScripts.tests" />
-    <module old-name="junit5_rt" new-name="intellij.junit.v5.rt" />
-    <module old-name="platform-resources-en" new-name="intellij.platform.resources.en" />
-    <module old-name="junit5_rt_tests" new-name="intellij.junit.v5.rt.tests" />
+    <module old-name="manifest" new-name="intellij.java.manifest" />
+    <module old-name="manifest-merger" new-name="android.sdktools.manifest-merger" />
+    <module old-name="maven" new-name="intellij.maven" />
+    <module old-name="maven-artifact-resolver-common" new-name="intellij.maven.artifactResolver.common" />
+    <module old-name="maven-artifact-resolver-m2" new-name="intellij.maven.artifactResolver.m2" />
+    <module old-name="maven-artifact-resolver-m3" new-name="intellij.maven.artifactResolver.m3" />
+    <module old-name="maven-artifact-resolver-m31" new-name="intellij.maven.artifactResolver.m31" />
+    <module old-name="maven-jps-plugin" new-name="intellij.maven.jps" />
+    <module old-name="maven-server-api" new-name="intellij.maven.server" />
+    <module old-name="maven2-server-impl" new-name="intellij.maven.server.m2.impl" />
+    <module old-name="maven3-server-common" new-name="intellij.maven.server.m3.common" />
+    <module old-name="maven3-server-impl" new-name="intellij.maven.server.m3.impl" />
+    <module old-name="maven30-server-impl" new-name="intellij.maven.server.m30.impl" />
+    <module old-name="ninepatch" new-name="android.sdktools.ninepatch" />
+    <module old-name="node-rpc-client" new-name="intellij.nodeRpcClient" />
+    <module old-name="observable" new-name="intellij.android.observable" />
+    <module old-name="observable-ui" new-name="intellij.android.observable.ui" />
+    <module old-name="openapi" new-name="intellij.java" />
     <module old-name="perfd-host" new-name="intellij.android.perfdHost" />
-    <module old-name="devkit-jps-plugin" new-name="intellij.devkit.jps" />
-    <module old-name="ipnb" new-name="intellij.python.ipnb" />
-    <module old-name="community-resources" new-name="intellij.idea.community.resources" />
+    <module old-name="perflib" new-name="android.sdktools.perflib" />
+    <module old-name="pixelprobe" new-name="android.sdktools.pixelprobe" />
+    <module old-name="platform-api" new-name="intellij.platform.ide" />
+    <module old-name="platform-build-scripts" new-name="intellij.platform.buildScripts" />
+    <module old-name="platform-build-scripts-tests" new-name="intellij.platform.buildScripts.tests" />
+    <module old-name="platform-impl" new-name="intellij.platform.ide.impl" />
+    <module old-name="platform-main" new-name="intellij.platform.main" />
+    <module old-name="platform-resources" new-name="intellij.platform.resources" />
+    <module old-name="platform-resources-en" new-name="intellij.platform.resources.en" />
+    <module old-name="platform-tests" new-name="intellij.platform.tests" />
+    <module old-name="profilers" new-name="intellij.android.profilers" />
+    <module old-name="profilers-android" new-name="intellij.android.profilersAndroid" />
+    <module old-name="profilers-ui" new-name="intellij.android.profilers.ui" />
+    <module old-name="projectModel-api" new-name="intellij.platform.projectModel" />
+    <module old-name="projectModel-impl" new-name="intellij.platform.projectModel.impl" />
+    <module old-name="properties" new-name="intellij.properties" />
+    <module old-name="properties-psi-api" new-name="intellij.properties.psi" />
+    <module old-name="properties-psi-impl" new-name="intellij.properties.psi.impl" />
+    <module old-name="protocol-model-generator" new-name="intellij.javascript.protocolModelGenerator" />
+    <module old-name="protocol-reader" new-name="intellij.javascript.protocolReader" />
+    <module old-name="protocol-reader-runtime" new-name="intellij.platform.scriptDebugger.protocolReaderRuntime" />
+    <module old-name="pycharm-edu-dependencies" new-name="intellij.pycharm.edu.dependencies" />
+    <module old-name="python-community" new-name="intellij.python.community.impl" />
+    <module old-name="python-community-build" new-name="intellij.pycharm.community.build" />
+    <module old-name="python-community-configure" new-name="intellij.python.configure" />
+    <module old-name="python-community-ide" new-name="intellij.pycharm.community" />
+    <module old-name="python-community-ide-resources" new-name="intellij.pycharm.community.resources" />
+    <module old-name="python-community-plugin" new-name="intellij.python.community.plugin.main" />
+    <module old-name="python-community-plugin-build-patches" new-name="intellij.python.community.plugin.buildPatches" />
+    <module old-name="python-community-plugin-core" new-name="intellij.python.community.plugin" />
+    <module old-name="python-community-plugin-java" new-name="intellij.python.community.plugin.java" />
+    <module old-name="python-community-plugin-minor" new-name="intellij.python.community.plugin.minor" />
+    <module old-name="python-community-plugin-resources" new-name="intellij.python.community.plugin.resources" />
+    <module old-name="python-community-tests" new-name="intellij.python.community.tests" />
+    <module old-name="python-community-tools" new-name="intellij.python.tools" />
+    <module old-name="python-edu-build" new-name="intellij.pycharm.edu.build" />
+    <module old-name="python-helpers" new-name="intellij.python.helpers" />
+    <module old-name="python-openapi" new-name="intellij.python.community" />
+    <module old-name="python-plugin-tests" new-name="intellij.python.community.plugin.tests" />
+    <module old-name="python-psi-api" new-name="intellij.python.psi" />
+    <module old-name="python-pydev" new-name="intellij.python.pydev" />
+    <module old-name="python-rest" new-name="intellij.python.reStructuredText" />
+    <module old-name="python-terminal" new-name="intellij.python.terminal" />
+    <module old-name="relaxng" new-name="intellij.relaxng" />
+    <module old-name="remote-servers-agent-rt" new-name="intellij.platform.remoteServers.agent.rt" />
+    <module old-name="remote-servers-api" new-name="intellij.platform.remoteServers" />
+    <module old-name="remote-servers-git" new-name="intellij.platform.remoteServers.git" />
+    <module old-name="remote-servers-git-java" new-name="intellij.java.remoteServers.git" />
+    <module old-name="remote-servers-impl" new-name="intellij.platform.remoteServers.impl" />
+    <module old-name="remote-servers-java-api" new-name="intellij.java.remoteServers" />
+    <module old-name="remote-servers-java-impl" new-name="intellij.java.remoteServers.impl" />
+    <module old-name="repository" new-name="android.sdktools.repository" />
+    <module old-name="resources" new-name="intellij.java.resources" />
+    <module old-name="resources-en" new-name="intellij.java.resources.en" />
+    <module old-name="rest" new-name="intellij.reStructuredText" />
+    <module old-name="schema-reader-generator" new-name="intellij.javascript.schemaReaderGenerator" />
+    <module old-name="script-debugger-backend" new-name="intellij.platform.scriptDebugger.backend" />
+    <module old-name="script-debugger-ui" new-name="intellij.platform.scriptDebugger.ui" />
+    <module old-name="sdk-common" new-name="android.sdktools.sdk-common" />
+    <module old-name="sdk-updates" new-name="intellij.android.sdkUpdates" />
+    <module old-name="sdklib" new-name="android.sdktools.sdklib" />
+    <module old-name="settings-repository" new-name="intellij.settingsRepository" />
+    <module old-name="settings-repository-tests" new-name="intellij.settingsRepository.tests" />
+    <module old-name="sherpa-ui" new-name="intellij.android.sherpaUi" />
+    <module old-name="smRunner" new-name="intellij.platform.smRunner" />
+    <module old-name="smali" new-name="intellij.android.smali" />
+    <module old-name="smartcvs-src" new-name="intellij.vcs.cvs.smartcvs" />
+    <module old-name="spellchecker" new-name="intellij.spellchecker" />
+    <module old-name="stats-collector" new-name="intellij.statsCollector" />
+    <module old-name="stream-debugger" new-name="intellij.java.debugger.streams" />
+    <module old-name="structuralsearch" new-name="intellij.platform.structuralSearch" />
+    <module old-name="structuralsearch-groovy" new-name="intellij.groovy.structuralSearch" />
+    <module old-name="structuralsearch-java" new-name="intellij.java.structuralSearch" />
+    <module old-name="structuralsearch-tests" new-name="intellij.platform.structuralSearch.tests" />
+    <module old-name="structure-view-impl" new-name="intellij.platform.structureView.impl" />
+    <module old-name="svn4idea" new-name="intellij.vcs.svn" />
+    <module old-name="svn4idea-tests" new-name="intellij.vcs.svn.tests" />
+    <module old-name="tasks-api" new-name="intellij.tasks" />
+    <module old-name="tasks-core" new-name="intellij.tasks.core" />
+    <module old-name="tasks-java" new-name="intellij.tasks.java" />
+    <module old-name="tasks-platform-api" new-name="intellij.platform.tasks" />
+    <module old-name="tasks-platform-impl" new-name="intellij.platform.tasks.impl" />
+    <module old-name="tasks-tests" new-name="intellij.tasks.tests" />
+    <module old-name="terminal" new-name="intellij.terminal" />
+    <module old-name="testExtensions" new-name="intellij.platform.testExtensions" />
+    <module old-name="testFramework" new-name="intellij.platform.testFramework" />
+    <module old-name="testFramework-java" new-name="intellij.java.testFramework" />
+    <module old-name="testFramework.core" new-name="intellij.platform.testFramework.core" />
+    <module old-name="testGuiFramework" new-name="intellij.platform.testGuiFramework" />
+    <module old-name="testRunner" new-name="intellij.platform.testRunner" />
+    <module old-name="testng" new-name="intellij.testng" />
+    <module old-name="testng_rt" new-name="intellij.testng.rt" />
+    <module old-name="tests_bootstrap" new-name="intellij.tools.testsBootstrap" />
+    <module old-name="testutils" new-name="android.sdktools.testutils" />
+    <module old-name="typeMigration" new-name="intellij.java.typeMigration" />
+    <module old-name="uast-common" new-name="intellij.platform.uast" />
+    <module old-name="uast-java" new-name="intellij.java.uast" />
+    <module old-name="uast-tests" new-name="intellij.platform.uast.tests" />
+    <module old-name="ui-designer" new-name="intellij.java.guiForms.designer" />
+    <module old-name="ui-designer-core" new-name="intellij.uiDesigner" />
+    <module old-name="ui-designer-jps-plugin" new-name="intellij.java.guiForms.jps" />
+    <module old-name="uitest-framework" new-name="intellij.android.guiTestFramework" />
+    <module old-name="update-server-mock" new-name="intellij.tools.updateServerMock" />
+    <module old-name="updater" new-name="intellij.platform.updater" />
+    <module old-name="usageView" new-name="intellij.platform.usageView" />
+    <module old-name="util" new-name="intellij.platform.util" />
+    <module old-name="util-rt" new-name="intellij.platform.util.rt" />
+    <module old-name="util-tests" new-name="intellij.platform.util.tests" />
+    <module old-name="vcs-api" new-name="intellij.platform.vcs" />
+    <module old-name="vcs-api-core" new-name="intellij.platform.vcs.core" />
+    <module old-name="vcs-impl" new-name="intellij.platform.vcs.impl" />
+    <module old-name="vcs-log-api" new-name="intellij.platform.vcs.log" />
+    <module old-name="vcs-log-graph" new-name="intellij.platform.vcs.log.graph.impl" />
+    <module old-name="vcs-log-graph-api" new-name="intellij.platform.vcs.log.graph" />
+    <module old-name="vcs-log-impl" new-name="intellij.platform.vcs.log.impl" />
     <module old-name="vcs-tests" new-name="intellij.platform.vcs.tests" />
     <module old-name="wizard" new-name="intellij.android.wizard" />
-    <module old-name="gradle-tests" new-name="intellij.gradle.tests" />
-    <module old-name="jshell-frontend" new-name="intellij.java.jshell.frontend" />
-    <module old-name="lang-tests" new-name="intellij.platform.lang.tests" />
-    <module old-name="built-in-server" new-name="intellij.platform.builtInServer.impl" />
-    <module old-name="android-gradle-jps" new-name="intellij.android.gradle.jps" />
-    <module old-name="profilers-android" new-name="intellij.android.profilersAndroid" />
-    <module old-name="google-app-engine" new-name="intellij.java.googleAppEngine" />
-    <module old-name="main_AndroidStudio" new-name="intellij.androidStudio.main" />
-    <module old-name="android-uitests" new-name="intellij.android.guiTests" />
-    <module old-name="execution-impl" new-name="intellij.java.execution.impl" />
-    <module old-name="sdk-common" new-name="android.sdktools.sdk-common" />
-    <module old-name="vcs-log-graph" new-name="intellij.platform.vcs.log.graph.impl" />
-    <module old-name="extensions" new-name="intellij.platform.extensions" />
-    <module old-name="antlayout" new-name="intellij.tools.jps.antTasks" />
-    <module old-name="vcs-api" new-name="intellij.platform.vcs" />
+    <module old-name="wizard-model" new-name="intellij.android.wizard.model" />
+    <module old-name="xdebugger-api" new-name="intellij.platform.debugger" />
+    <module old-name="xdebugger-impl" new-name="intellij.platform.debugger.impl" />
+    <module old-name="xml" new-name="intellij.xml.impl" />
+    <module old-name="xml-analysis-api" new-name="intellij.xml.analysis" />
+    <module old-name="xml-analysis-impl" new-name="intellij.xml.analysis.impl" />
     <module old-name="xml-openapi" new-name="intellij.xml" />
-    <module old-name="maven3-server-impl" new-name="intellij.maven.server.m3.impl" />
-    <module old-name="tasks-tests" new-name="intellij.tasks.tests" />
-    <module old-name="remote-servers-api" new-name="intellij.platform.remoteServers" />
-    <module old-name="script-debugger-ui" new-name="intellij.platform.scriptDebugger.ui" />
-    <module old-name="vcs-api-core" new-name="intellij.platform.vcs.core" />
-    <module old-name="remote-servers-impl" new-name="intellij.platform.remoteServers.impl" />
-    <module old-name="manifest" new-name="intellij.java.manifest" />
-    <module old-name="jps-model-serialization" new-name="intellij.platform.jps.model.serialization" />
-    <module old-name="testRunner" new-name="intellij.platform.testRunner" />
-    <module old-name="jps-serialization-tests" new-name="intellij.platform.jps.model.serialization.tests" />
-    <module old-name="updater" new-name="intellij.platform.updater" />
-    <module old-name="schema-reader-generator" new-name="intellij.javascript.schemaReaderGenerator" />
-    <module old-name="lang-impl" new-name="intellij.platform.lang.impl" />
-    <module old-name="editor-ui-ex" new-name="intellij.platform.editor.ex" />
-    <module old-name="java-lib-model-builder" new-name="intellij.android.javaLibModel.builder" />
-    <module old-name="maven2-server-impl" new-name="intellij.maven.server.m2.impl" />
-    <module old-name="android-ultimate" new-name="intellij.android.ultimate" />
+    <module old-name="xml-psi-api" new-name="intellij.xml.psi" />
+    <module old-name="xml-psi-impl" new-name="intellij.xml.psi.impl" />
+    <module old-name="xml-structure-view-api" new-name="intellij.xml.structureView" />
+    <module old-name="xml-structure-view-impl" new-name="intellij.xml.structureView.impl" />
+    <module old-name="xml-tests" new-name="intellij.xml.tests" />
+    <module old-name="xpath" new-name="intellij.xpath" />
+    <module old-name="xslt-debugger" new-name="intellij.xslt.debugger" />
+    <module old-name="xslt-debugger-engine" new-name="intellij.xslt.debugger.engine" />
+    <module old-name="xslt-debugger-engine-impl" new-name="intellij.xslt.debugger.engine.impl" />
+    <module old-name="xslt-rt" new-name="intellij.xslt.debugger.rt" />
     <module old-name="yaml" new-name="intellij.yaml" />
-    <module old-name="built-in-server-tests" new-name="intellij.platform.builtInServer.tests" />
   </component>
   <component name="ProjectModuleManager">
     <modules>
@@ -421,7 +421,6 @@
       <module fileurl="file://$PROJECT_DIR$/android/smali/intellij.android.smali.iml" filepath="$PROJECT_DIR$/android/smali/intellij.android.smali.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/android-test-framework/intellij.android.testFramework.iml" filepath="$PROJECT_DIR$/android/android-test-framework/intellij.android.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/android/intellij.android.tests.iml" filepath="$PROJECT_DIR$/android/android/intellij.android.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android/ultimate/intellij.android.ultimate.iml" filepath="$PROJECT_DIR$/android/ultimate/intellij.android.ultimate.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/wizard/intellij.android.wizard.iml" filepath="$PROJECT_DIR$/android/wizard/intellij.android.wizard.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/wizard-model/intellij.android.wizard.model.iml" filepath="$PROJECT_DIR$/android/wizard-model/intellij.android.wizard.model.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/android/intellij.androidStudio.main.iml" filepath="$PROJECT_DIR$/android/android/intellij.androidStudio.main.iml" />
@@ -571,9 +570,9 @@
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/intellij.platform.externalSystem.rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/intellij.platform.externalSystem.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/icons/intellij.platform.icons.iml" filepath="$PROJECT_DIR$/platform/icons/intellij.platform.icons.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-api/intellij.platform.ide.iml" filepath="$PROJECT_DIR$/platform/platform-api/intellij.platform.ide.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/images/intellij.platform.images.iml" filepath="$PROJECT_DIR$/images/intellij.platform.images.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/build-scripts/icons/intellij.platform.images.build.iml" filepath="$PROJECT_DIR$/platform/build-scripts/icons/intellij.platform.images.build.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/intellij.platform.ide.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-api/intellij.platform.indexing.iml" filepath="$PROJECT_DIR$/platform/indexing-api/intellij.platform.indexing.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/intellij.platform.indexing.impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/intellij.platform.indexing.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/jps/jps-builders/intellij.platform.jps.build.iml" filepath="$PROJECT_DIR$/jps/jps-builders/intellij.platform.jps.build.iml" />