diff --git a/java/codeserver/core/resources/intellij.java.codeserver.core.xml b/java/codeserver/core/resources/intellij.java.codeserver.core.xml
index 9010623a03a3..bde230c7150d 100644
--- a/java/codeserver/core/resources/intellij.java.codeserver.core.xml
+++ b/java/codeserver/core/resources/intellij.java.codeserver.core.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
   <dependencies>
     <!--todo temporary disabled until it will be a backend module-->
     <!--<module name="intellij.java.frontback.psi"/>-->
diff --git a/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
index 8cbc4cbb54a6..18d7dcd27f04 100644
--- a/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
+++ b/java/codeserver/highlighting/resources/intellij.java.codeserver.highlighting.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="public">
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
   <dependencies>
     <module name="intellij.platform.core"/>
 
diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml
index f130ca6ced93..209e32eb0774 100644
--- a/java/debugger/impl/resources/META-INF/java-debugger.xml
+++ b/java/debugger/impl/resources/META-INF/java-debugger.xml
@@ -462,14 +462,12 @@
     <group id="ToggleBreakpointAction">
       <action id="ToggleMethodBreakpoint" class="com.intellij.debugger.actions.ToggleMethodBreakpointAction">
         <override-text place="MainMenu"/>
-        <!--todo changed in JavaActions.xml-->
-        <!--<add-to-group group-id="JavaCompileGroup" anchor="first"/>-->
+        <!--also used in JavaActions.xml-->
       </action>
       <action id="ToggleFieldBreakpoint" class="com.intellij.debugger.actions.ToggleFieldBreakpointAction">
         <override-text place="MainMenu"/>
         <add-to-group group-id="XDebugger.ValueGroup" anchor="after" relative-to-action="Debugger.AddToWatch"/>
-        <!--todo changed in JavaActions.xml-->
-        <!--<add-to-group group-id="JavaCompileGroup" anchor="after" relative-to-action="ToggleMethodBreakpoint"/>-->
+        <!--also used in JavaActions.xml-->
       </action>
       <add-to-group group-id="BreakpointActionsGroup" anchor="after" relative-to-action="ToggleLineBreakpoint"/>
     </group>
diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml
index 19eba4a6b0f2..9a097601a0aa 100644
--- a/java/java-backend/resources/META-INF/JavaPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaPlugin.xml
@@ -992,9 +992,9 @@
     <dom.customAnnotationChecker implementation="com.intellij.util.xml.impl.ExtendsClassChecker"/>
     <codeInsight.surroundWithRangeAdjuster implementation="com.intellij.codeInsight.generation.surroundWith.XmlSurroundWithRangeAdjuster"/>
     <liveTemplateSubstitutor implementation="com.intellij.codeInsight.template.impl.JavaTemplateSubstitutor"/>
-    <defaultLiveTemplates file="liveTemplates/Java" useParentLoader="true"/>
-    <defaultLiveTemplates file="liveTemplates/JavaImplicitClass" useParentLoader="true"/>
-    <defaultLiveTemplates file="liveTemplates/JavaNormalClassesWithInstanceMain" useParentLoader="true"/>
+    <defaultLiveTemplates file="liveTemplates/Java"/>
+    <defaultLiveTemplates file="liveTemplates/JavaImplicitClass"/>
+    <defaultLiveTemplates file="liveTemplates/JavaNormalClassesWithInstanceMain"/>
     <treeStructureProvider id="ClassesTreeStructureProvider" implementation="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider"
                            order="last, after NestingTreeStructureProvider"/>
     <importFilteringRule implementation="com.intellij.usages.impl.rules.ImportFilteringRule"/>
diff --git a/resources/src/liveTemplates/Java.xml b/java/java-backend/resources/liveTemplates/Java.xml
similarity index 100%
rename from resources/src/liveTemplates/Java.xml
rename to java/java-backend/resources/liveTemplates/Java.xml
diff --git a/resources/src/liveTemplates/JavaImplicitClass.xml b/java/java-backend/resources/liveTemplates/JavaImplicitClass.xml
similarity index 100%
rename from resources/src/liveTemplates/JavaImplicitClass.xml
rename to java/java-backend/resources/liveTemplates/JavaImplicitClass.xml
diff --git a/resources/src/liveTemplates/JavaNormalClassesWithInstanceMain.xml b/java/java-backend/resources/liveTemplates/JavaNormalClassesWithInstanceMain.xml
similarity index 100%
rename from resources/src/liveTemplates/JavaNormalClassesWithInstanceMain.xml
rename to java/java-backend/resources/liveTemplates/JavaNormalClassesWithInstanceMain.xml
diff --git a/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml b/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml
deleted file mode 100644
index f632d33a5139..000000000000
--- a/java/remote-servers/impl/resources/META-INF/Java-RemoteServer.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<idea-plugin >
-
-  <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.remoteServer.moduleBuilderContribution"
-                    interface="com.intellij.remoteServer.impl.module.CloudModuleBuilderContributionFactory"/>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceInterface="com.intellij.remoteServer.runtime.deployment.debug.JavaDebuggerLauncher"
-                        serviceImplementation="com.intellij.remoteServer.impl.runtime.deployment.debug.JavaDebuggerLauncherImpl"/>
-
-    <applicationService serviceInterface="com.intellij.remoteServer.configuration.deployment.JavaDeploymentSourceUtil"
-                        serviceImplementation="com.intellij.remoteServer.impl.configuration.deployment.JavaDeploymentSourceUtilImpl"/>
-    <remoteServer.deploymentSource.type implementation="com.intellij.remoteServer.impl.configuration.deployment.ArtifactDeploymentSourceType"/>
-    <moduleBuilder builderClass="com.intellij.remoteServer.impl.module.CloudModuleBuilder"/>
-  </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
index 1f025c50f5b7..c555d461d195 100644
--- a/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
+++ b/java/remote-servers/impl/resources/intellij.java.remoteServers.impl.xml
@@ -1,4 +1,4 @@
-<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" visibility="internal">
+<idea-plugin visibility="internal">
   <dependencies>
     <module name="intellij.java.remoteServers"/>
     <module name="intellij.java.compiler.impl"/>
@@ -20,6 +20,19 @@
 
   </dependencies>
 
-  <xi:include href="/META-INF/Java-RemoteServer.xml"/>
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.remoteServer.moduleBuilderContribution"
+                    interface="com.intellij.remoteServer.impl.module.CloudModuleBuilderContributionFactory"/>
+  </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceInterface="com.intellij.remoteServer.runtime.deployment.debug.JavaDebuggerLauncher"
+                        serviceImplementation="com.intellij.remoteServer.impl.runtime.deployment.debug.JavaDebuggerLauncherImpl"/>
+
+    <applicationService serviceInterface="com.intellij.remoteServer.configuration.deployment.JavaDeploymentSourceUtil"
+                        serviceImplementation="com.intellij.remoteServer.impl.configuration.deployment.JavaDeploymentSourceUtilImpl"/>
+    <remoteServer.deploymentSource.type implementation="com.intellij.remoteServer.impl.configuration.deployment.ArtifactDeploymentSourceType"/>
+    <moduleBuilder builderClass="com.intellij.remoteServer.impl.module.CloudModuleBuilder"/>
+  </extensions>
 
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt
index e09553613df1..75b084d8cc99 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/DefaultLiveTemplateEP.kt
@@ -26,11 +26,4 @@ internal class DefaultLiveTemplateEP {
   @Attribute
   @JvmField
   var hidden: Boolean = false
-
-  /**
-   * `true` if it is necessary to use the parent loader
-   */
-  @Attribute
-  @JvmField
-  var useParentLoader: Boolean = false
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index 099eae6553a0..b3e68317ce77 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
@@ -502,7 +502,7 @@ public final class TemplateSettings implements PersistentStateComponent<Template
 
         try {
           ClassLoader pluginClassLoader = pluginDescriptor.getClassLoader();
-          readDefTemplate(file, !ep.hidden, pluginClassLoader, PluginInfoDetectorKt.getPluginInfoByDescriptor(pluginDescriptor), ep.useParentLoader);
+          readDefTemplate(file, !ep.hidden, pluginClassLoader, PluginInfoDetectorKt.getPluginInfoByDescriptor(pluginDescriptor));
         }
         catch (Exception e) {
           LOG.error(new PluginException(e, pluginDescriptor.getPluginId()));
@@ -539,23 +539,15 @@ public final class TemplateSettings implements PersistentStateComponent<Template
                                boolean registerTemplate,
                                @NotNull ClassLoader loader,
                                PluginInfo info) throws JDOMException {
-    readDefTemplate(defTemplate, registerTemplate, loader, info, false);
-  }
-
-    private void readDefTemplate(@NotNull String defTemplate,
-                               boolean registerTemplate,
-                               @NotNull ClassLoader loader,
-                               PluginInfo info,
-                               boolean useParentLoader) throws JDOMException {
     String pluginId = info.getId();
     Element element;
     try {
       byte[] data;
       if (defTemplate.startsWith("/")) {
-        data = ResourceUtil.getResourceAsBytes(appendExt(defTemplate.substring(1)), loader, useParentLoader);
+        data = ResourceUtil.getResourceAsBytes(appendExt(defTemplate.substring(1)), loader);
       }
       else {
-        data = ResourceUtil.getResourceAsBytes(appendExt(defTemplate), loader, useParentLoader);
+        data = ResourceUtil.getResourceAsBytes(appendExt(defTemplate), loader);
       }
       if (data == null) {
         LOG.error(new PluginException("Unable to find template resource: " + defTemplate + "; classLoader: " + loader + "; plugin: " + info,
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
deleted file mode 100644
index dd0d053218ce..000000000000
--- a/resources/src/idea/JavaActions.xml
+++ /dev/null
@@ -1,428 +0,0 @@
-<!--todo preserve just for compatibility-->
-<!--DON'T EDIT-->
-<!--PLANNED TO REMOVE-->
-<!--DEPRECATED-->
-<!--suppress ModuleNotRegisteredAsPluginContent -->
-<idea-plugin visibility="public">
-
-
-  <resource-bundle>messages.ActionsBundle</resource-bundle>
-  <actions>
-    <action id="FileChooser.GotoModule" class="com.intellij.openapi.fileChooser.actions.GotoModuleDirAction"
-            icon="AllIcons.Actions.ModuleDirectory">
-      <add-to-group group-id="FileChooserToolbar" anchor="after" relative-to-action="FileChooser.GotoProject"/>
-    </action>
-
-
-    <group id="NewGroup1" searchable="false">
-      <action id="NewModuleInGroup" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleInGroupAction"
-              icon="AllIcons.Nodes.Module"/>
-
-      <add-to-group group-id="NewGroup" anchor="first"/>
-    </group>
-
-    <!-- File -->
-
-    <group id="JavaNewProjectOrModuleGroup">
-      <group id="JavaNewProjectGroup">
-        <action id="NewProject" class="com.intellij.ide.actions.NewProjectAction">
-          <override-text place="ProjectWidgetPopup"/>
-          <add-to-group group-id="ProjectWidget.Actions" anchor="first"/>
-        </action>
-        <action id="ImportProject" class="com.intellij.ide.actions.ImportProjectAction"/>
-        <action id="ProjectFromVersionControl" class="com.intellij.openapi.wm.impl.welcomeScreen.ProjectFromVersionControlAction">
-          <override-text place="ProjectWidgetPopup"/>
-          <add-to-group group-id="ProjectWidget.Actions"/>
-        </action>
-      </group>
-      <separator/>
-      <action id="NewModule" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleAction"/>
-      <action id="ImportModule" class="com.intellij.ide.actions.ImportModuleAction"/>
-
-      <add-to-group group-id="NewProjectOrModuleGroup"/>
-    </group>
-
-    <action id="SaveAsNewFormat" class="com.intellij.ide.actions.SaveAsDirectoryBasedFormatAction">
-      <add-to-group group-id="ExportImportGroup" anchor="last"/>
-    </action>
-
-    <action id="ConvertModuleGroupsToQualifiedNames" class="com.intellij.ide.actions.project.ConvertModuleGroupsToQualifiedNamesAction">
-      <add-to-group group-id="FileMainSettingsGroup" anchor="last"/>
-    </action>
-
-    <action id="ShowProjectStructureSettings" class="com.intellij.ide.actions.ShowStructureSettingsAction"
-            icon="AllIcons.General.ProjectStructure">
-      <add-to-group group-id="FileMainSettingsGroup" anchor="after" relative-to-action="ShowSettings"/>
-      <add-to-group group-id="SettingsEntryPointGroup" anchor="before" relative-to-action="ShowSettings"/>
-    </action>
-    <action id="ShowSiblings" class="com.intellij.codeInsight.hint.actions.ShowSiblingsAction">
-      <add-to-group group-id="QuickActions" anchor="after" relative-to-action="QuickImplementations"/>
-    </action>
-    <action id="ShowRecentTests" class="com.intellij.testIntegration.ShowRecentTests">
-      <keyboard-shortcut first-keystroke="control shift SEMICOLON" keymap="$default"/>
-    </action>
-
-    <action class="com.intellij.execution.testDiscovery.actions.ShowAffectedTestsAction" id="ShowDiscoveredTests">
-      <add-to-group group-id="RunTestGroup" anchor="last"/>
-      <add-to-group group-id="ChangesViewPopupMenu" anchor="last"/>
-    </action>
-
-    <action class="com.intellij.execution.testDiscovery.actions.FindUnusedTestDataAction" id="FindUsedTestData"
-            internal="true"/>
-
-
-
-    <action id="JavaSoftExit" class="com.intellij.execution.impl.DefaultJavaProgramRunner$SoftExitAction">
-      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
-      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
-    </action>
-
-    <action id="JavaControlBreak" class="com.intellij.execution.impl.DefaultJavaProgramRunner$ControlBreakAction">
-      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
-      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
-    </action>
-
-    <!-- View -->
-    <reference ref="DelegateMethods">
-      <add-to-group group-id="CodeMenu" anchor="after" relative-to-action="ImplementMethods"/>
-    </reference>
-
-    <!-- Analyze -->
-    <group overrides="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup" id="InspectCodeActionInPopupMenus"/>
-
-    <group id="AnalyzeMenu" popup="true">
-      <reference ref="InspectCodeGroup"/>
-      <separator/>
-      <reference ref="AnalyzeActions"/>
-
-      <add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="ReplaceInPath"/>
-      <add-to-group group-id="NavbarPopupMenu" anchor="after" relative-to-action="ReplaceInPath"/>
-    </group>
-
-    <group id="Java.BuildMenu">
-      <action id="CompileDirty" class="com.intellij.compiler.actions.CompileDirtyAction" icon="AllIcons.Actions.Compile">
-        <add-to-group group-id="TouchBarDefault" anchor="before" relative-to-action="RunConfiguration"/>
-        <add-to-group group-id="RightToolbarSideGroup" anchor="first"/>
-      </action>
-      <action id="MakeModule" class="com.intellij.compiler.actions.MakeModuleAction"/>
-      <action id="Compile" class="com.intellij.compiler.actions.CompileAction"/>
-      <action id="CompileFile" class="com.intellij.compiler.actions.CompileFileAction" use-shortcut-of="Compile"/>
-      <separator/>
-      <action id="CompileProject" class="com.intellij.compiler.actions.CompileProjectAction" icon="com.intellij.icons.AllIcons.Actions.Rebuild"/>
-      <separator/>
-      <separator/>
-      <action id="BuildArtifact" class="com.intellij.compiler.actions.BuildArtifactAction"/>
-
-      <add-to-group group-id="BuildMenu"/>
-    </group>
-
-    <action id="DebugBuildProcess" class="com.intellij.compiler.actions.DebugBuildProcessToggleAction"/>
-
-    <group id="CompilerErrorViewPopupMenu">
-      <action id="ExcludeFromValidation" class="com.intellij.compiler.options.ExcludeFromValidationAction"/>
-    </group>
-
-    <!-- Tools -->
-    <group id="Internal1" internal="true">
-      <separator/>
-      <action id="Merge3Files" internal="true" class="com.intellij.openapi.diff.actions.MergeFilesAction"/>
-      <separator/>
-      <add-to-group group-id="Internal" anchor="last"/>
-    </group>
-
-    <!-- Toolbar -->
-
-    <group id="ToolbarMakeGroup">
-      <reference ref="CompileDirty"/>
-
-      <add-to-group group-id="ToolbarRunGroup" relative-to-action="RunConfiguration" anchor="before"/>
-    </group>
-
-    <group id="EditorTabCompileGroup">
-      <reference ref="Compile"/>
-      <add-to-group group-id="EditorTabPopupMenuEx" anchor="before" relative-to-action="RunContextPopupGroup"/>
-    </group>
-
-    <action id="ModuleSettings" class="com.intellij.ide.actions.ShowModulePropertiesAction"/>
-    <action id="OpenModuleSettings" class="com.intellij.ide.actions.OpenModuleSettingsAction" use-shortcut-of="EditSource"/>
-    <action id="LoadUnloadModules" class="com.intellij.ide.projectView.actions.LoadUnloadModulesAction">
-      <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="after" relative-to-action="OpenModuleSettings"/>
-    </action>
-    <group id="MoveModuleToGroup" class="com.intellij.ide.projectView.impl.MoveModuleToGroupTopLevel" popup="true"/>
-
-    <group id="EditorPopupMenuAnalyze" class="com.intellij.ide.actions.EditorPopupNoSelectionGroup">
-      <reference ref="AnalyzeMenu"/>
-      <add-to-group group-id="EditorPopupMenu1" anchor="after" relative-to-action="FindUsages"/>
-    </group>
-
-    <group id="ProjectViewAnalysisGroup">
-      <add-to-group group-id="ProjectViewPopupMenuModifyGroup" anchor="first"/>
-    </group>
-
-    <group id="ProjectViewCompileGroup">
-      <reference ref="MakeModule"/>
-      <reference ref="Compile"/>
-
-      <add-to-group group-id="ProjectViewPopupMenuRunGroup" anchor="first"/>
-    </group>
-
-    <action id="PackageFile" class="com.intellij.packaging.impl.ui.actions.PackageFileAction" use-shortcut-of="Compile">
-      <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="Compile"/>
-      <add-to-group group-id="ProjectViewPopupMenu" anchor="before" relative-to-action="MakeModule"/>
-      <add-to-group group-id="ScopeViewPopupMenu" anchor="before" relative-to-action="MakeModule"/>
-    </action>
-
-
-    <reference ref="OpenModuleSettings">
-      <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="first"/>
-    </reference>
-    <reference ref="MoveModuleToGroup">
-      <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="after" relative-to-action="OpenModuleSettings"/>
-    </reference>
-
-    <group id="StructureViewCompileGroup">
-      <separator/>
-      <reference ref="Compile"/>
-
-      <add-to-group group-id="StructureViewPopupMenu" anchor="after" relative-to-action="RunContextPopupGroup"/>
-    </group>
-
-
-    <group id="AnalyzeJavaMenu">
-      <separator/>
-      <group id="ShowPackageDepsGroup">
-        <action id="ShowPackageDeps" class="com.intellij.packageDependencies.actions.AnalyzeDependenciesAction">
-          <override-text place="MainMenu"/>
-          <override-text place="EditorPopup" use-text-of-place="MainMenu"/>
-        </action>
-        <action id="ShowBackwardPackageDeps" class="com.intellij.packageDependencies.actions.BackwardDependenciesAction">
-          <override-text place="MainMenu"/>
-          <override-text place="EditorPopup" use-text-of-place="MainMenu"/>
-        </action>
-        <action id="ShowDependenciesOnTarget" class="com.intellij.packageDependencies.actions.AnalyzeDependenciesOnSpecifiedTargetAction">
-          <override-text place="MainMenu"/>
-          <override-text place="EditorPopup" use-text-of-place="MainMenu"/>
-        </action>
-        <action id="ShowModulesDependencies" class="com.intellij.moduleDependencies.ShowModuleDependenciesAction">
-          <override-text place="MainMenu"/>
-          <override-text place="EditorPopup" use-text-of-place="MainMenu"/>
-        </action>
-        <action id="ShowPackageCycles" class="com.intellij.cyclicDependencies.actions.CyclicDependenciesAction">
-          <override-text place="MainMenu"/>
-          <override-text place="EditorPopup" use-text-of-place="MainMenu"/>
-        </action>
-        <separator/>
-      </group>
-
-      <add-to-group group-id="AnalyzeActions" anchor="before" relative-to-action="SliceBackward"/>
-    </group>
-
-    <group id="CommanderPopupMenu">
-      <reference ref="NewGroup"/>
-      <reference ref="AssociateWithFileType"/>
-      <separator/>
-      <reference ref="CutCopyPasteGroup"/>
-      <reference ref="EditSource"/>
-      <separator/>
-      <reference ref="FindUsages"/>
-      <reference ref="FindInPath"/>
-      <reference ref="ReplaceInPath"/>
-      <reference ref="InspectCode"/>
-      <reference ref="ShowPackageDepsGroup"/>
-      <reference ref="RefactoringMenu"/>
-      <separator/>
-      <reference ref="TypeHierarchy"/>
-      <reference ref="ReformatCode"/>
-      <reference ref="OptimizeImports"/>
-      <reference ref="$Delete"/>
-      <separator/>
-      <reference ref="Compile"/>
-      <reference ref="RunContextPopupGroup"/>
-      <reference ref="SplitRevealGroup"/>
-      <separator/>
-      <reference ref="VersionControlsGroup"/>
-
-      <reference ref="CompareTwoFiles"/>
-      <reference ref="CompareFileWithEditor"/>
-      <separator/>
-      <reference ref="ExternalToolsGroup"/>
-    </group>
-
-    <!-- ****************************************************************** -->
-
-    <group id="WelcomeScreen.Documentation.IDEA">
-      <action id="WelcomeScreen.DevelopPlugins" class="com.intellij.openapi.wm.impl.welcomeScreen.DevelopPluginsAction"/>
-      <add-to-group group-id="WelcomeScreen.Documentation" anchor="last"/>
-    </group>
-
-    <action id="AddFrameworkSupport" class="com.intellij.ide.util.frameworkSupport.AddFrameworkSupportAction">
-      <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="before" relative-to-action="LoadUnloadModules"/>
-    </action>
-
-    <group id="Java.ImportFrom.Group" searchable="false">
-      <action id="CreateLibraryFromFile" class="com.intellij.ide.projectView.actions.MarkLibraryRootAction"/>
-      <action id="ExtractModuleFromPackage" class="com.intellij.ide.extractModule.ExtractModuleFromPackageAction" internal="true"/>
-      <action id="ImportModuleFromImlFile" class="com.intellij.ide.projectView.actions.ImportModuleFromImlFileAction"/>
-      <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" relative-to-action="MarkRootGroup" anchor="after"/>
-    </group>
-
-    <action id="ChangesView.GroupBy.Module" class="com.intellij.openapi.vcs.changes.actions.SetModuleChangesGroupingAction">
-      <add-to-group group-id="ChangesView.GroupBy"/>
-    </action>
-
-    <group id="JavaGenerateGroup1">
-      <action id="GenerateTestMethod" class="com.intellij.testIntegration.GenerateTestMethodAction"/>
-      <action id="GenerateSetUpMethod" class="com.intellij.testIntegration.GenerateSetUpMethodAction"/>
-      <action id="GenerateTearDownMethod" class="com.intellij.testIntegration.GenerateTearDownMethodAction"/>
-      <action id="GenerateBeforeClassMethod" class="com.intellij.testIntegration.GenerateBeforeClassMethodAction"/>
-      <action id="GenerateAfterClassMethod" class="com.intellij.testIntegration.GenerateAfterClassMethodAction"/>
-      <action id="GenerateDataMethod" class="com.intellij.testIntegration.GenerateDataMethodAction"/>
-      <action id="GenerateTestDataPathMethods" class="com.intellij.testIntegration.GenerateTestDataPathMethodAction"/>
-      <action id="GenerateTestDataPathFiles" class="com.intellij.testIntegration.GenerateTestDataPathFileAction"/>
-      <separator/>
-      <action id="GenerateConstructor" class="com.intellij.codeInsight.generation.actions.GenerateConstructorAction"/>
-      <action id="GenerateLogField" class="com.intellij.codeInsight.generation.actions.GenerateLoggerAction"/>
-      <action id="GenerateGetter" class="com.intellij.codeInsight.generation.actions.GenerateGetterAction"/>
-      <action id="GenerateSetter" class="com.intellij.codeInsight.generation.actions.GenerateSetterAction"/>
-      <action id="GenerateGetterAndSetter" class="com.intellij.codeInsight.generation.actions.GenerateGetterAndSetterAction"/>
-      <!--suppress PluginXmlCapitalization -->
-      <action id="GenerateEquals" class="com.intellij.codeInsight.generation.actions.GenerateEqualsAction"/>
-      <!--suppress PluginXmlCapitalization -->
-      <action id="Actions.ActionsPlugin.GenerateToString" class="org.jetbrains.java.generate.GenerateToStringAction"/>
-      <action id="GenerateCreateUI" class="com.intellij.codeInsight.generation.actions.GenerateCreateUIAction"/>
-      <action id="GenerateProviderMethod" class="com.intellij.codeInsight.generation.actions.GenerateProviderMethodAction"/>
-      <add-to-group group-id="GenerateGroup" anchor="first"/>
-    </group>
-
-    <group id="JavaGenerateGroup2">
-      <action id="GenerateSuperMethodCall" class="com.intellij.codeInsight.generation.actions.GenerateSuperMethodCallAction"/>
-      <add-to-group group-id="GenerateGroup" anchor="last"/>
-    </group>
-
-    <action id="NewClass" class="com.intellij.ide.actions.CreateClassAction">
-      <add-to-group group-id="NewGroup1" anchor="first"/>
-    </action>
-
-    <group id="NewJavaSpecialFile">
-      <action id="NewPackageInfo" class="com.intellij.ide.actions.CreatePackageInfoAction"/>
-      <action id="NewModuleInfo" class="com.intellij.ide.actions.CreateModuleInfoAction"/>
-      <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewDir"/>
-    </group>
-
-    <action id="CompactSourceFile" class="com.intellij.ide.actions.CreateCompactSourceFileAction">
-      <add-to-group group-id="NewGroup1" anchor="after" relative-to-action="NewClass"/>
-    </action>
-
-    <action id="InferNullity" class="com.intellij.codeInspection.inferNullity.InferNullityAnnotationsAction">
-      <add-to-group group-id="AnalyzeActions" anchor="after" relative-to-action="ViewOfflineInspection"/>
-    </action>
-
-    <action id="GenerateModuleDescriptors" class="com.intellij.codeInspection.java19api.Java9GenerateModuleDescriptorsAction">
-      <add-to-group group-id="CodeMenu" anchor="last"/>
-    </action>
-
-    <group id="RefactoringMenu1">
-      <action id="ChangeTypeSignature" class="com.intellij.refactoring.typeMigration.actions.ChangeTypeSignatureAction"/>
-      <action id="MakeStatic" class="com.intellij.refactoring.actions.MakeStaticAction"/>
-      <action id="ConvertToInstanceMethod" class="com.intellij.refactoring.actions.ConvertToInstanceMethodAction"/>
-    </group>
-
-    <group id="RefactoringMenu2">
-      <action id="MethodDuplicates" class="com.intellij.refactoring.actions.MethodDuplicatesAction"/>
-
-      <add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="Inline"/>
-    </group>
-
-    <action id="ReplaceMethodWithMethodObject" class="com.intellij.refactoring.actions.ReplaceMethodWithMethodObjectAction">
-      <add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractMethod"/>
-    </action>
-
-    <action id="IntroduceFunctionalParameter" class="com.intellij.refactoring.actions.IntroduceFunctionalParameterAction">
-      <add-to-group group-id="IntroduceActionsGroup" anchor="before" relative-to-action="IntroduceParameterObject"/>
-      <keyboard-shortcut first-keystroke="control shift alt P" keymap="$default"/>
-      <keyboard-shortcut first-keystroke="control shift alt P" keymap="$default"/>
-    </action>
-
-    <action id="IntroduceFunctionalVariable" class="com.intellij.refactoring.actions.IntroduceFunctionalVariableAction">
-      <add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="IntroduceFunctionalParameter"/>
-    </action>
-
-    <group id="RefactoringMenuRenameFile">
-      <reference ref="RenameFile"/>
-      <add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="RenameElement"/>
-    </group>
-
-    <group id="MigrationMenu" popup="true" searchable="true">
-      <group id="MigrationMenu1" class="com.intellij.refactoring.migration.MigrationGroup" popup="false" searchable="false"/>
-      <separator/>
-      <action id="NewMigration" class="com.intellij.refactoring.actions.MigrateAction"/>
-    </group>
-
-    <group id="RefactoringMenu4">
-      <separator/>
-      <reference ref="RefactoringMenu1"/>
-      <separator/>
-      <action id="TurnRefsToSuper" class="com.intellij.refactoring.actions.TurnRefsToSuperAction"/>
-      <action id="InheritanceToDelegation" class="com.intellij.refactoring.actions.InheritanceToDelegationAction"/>
-      <separator/>
-      <action id="EncapsulateFields" class="com.intellij.refactoring.actions.EncapsulateFieldsAction"/>
-      <reference ref="MigrationMenu"/>
-      <separator/>
-
-      <add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="MemberPushDown"/>
-    </group>
-
-    <!-- The action remains for compatibility but is not added to menus because it does the same thing as Move, which is now
-         correctly labeled -->
-    <action id="AnonymousToInner" class="com.intellij.refactoring.actions.AnonymousToInnerAction"/>
-
-    <action id="GenerateJavadoc" class="com.intellij.javadoc.actions.GenerateJavadocAction">
-      <add-to-group group-id="ToolsBasicGroup" anchor="after" relative-to-action="SaveFileAsTemplate"/>
-    </action>
-
-    <group id="Internal.Java" popup="true" internal="true" compact="true">
-      <action id="GenerateVisitorByHierarchy" internal="true" class="com.intellij.internal.GenerateVisitorByHierarchyAction"/>
-
-      <action id="UsedIconsListing" internal="true" class="com.intellij.internal.UsedIconsListingAction"/>
-      <action id="ExpressionStatistics" internal="true" class="com.intellij.internal.ExpressionStatisticsAction"/>
-
-      <action id="StaticIconFields" internal="true" class="com.intellij.internal.StaticIconFieldsAction"/>
-      <add-to-group group-id="Internal"/>
-    </group>
-
-    <group id="JavaCompileGroup">
-      <separator/>
-      <reference ref="ToggleMethodBreakpoint"/>
-      <reference ref="ToggleFieldBreakpoint"/>
-
-      <add-to-group group-id="ProjectViewCompileGroup" anchor="first"/>
-      <add-to-group group-id="StructureViewCompileGroup" anchor="first"/>
-    </group>
-
-    <group id="JavaMethodHierarchyPopupMenu">
-      <action id="MethodHierarchy.ImplementMethodAction" class="com.intellij.ide.hierarchy.method.ImplementMethodAction"
-              use-shortcut-of="ImplementMethods"/>
-      <action id="MethodHierarchy.OverrideMethodAction" class="com.intellij.ide.hierarchy.method.OverrideMethodAction"
-              use-shortcut-of="OverrideMethods"/>
-      <separator/>
-      <add-to-group group-id="MethodHierarchyPopupMenu" anchor="first"/>
-    </group>
-
-    <action class="com.intellij.compiler.backwardRefs.view.TestCompilerRefFindUsagesAction" id="TestCompilerReferenceServiceFindUsages" internal="true"/>
-    <action class="com.intellij.compiler.backwardRefs.view.TestCompilerRefFunctionalExpressionSearchAction" id="TestCompilerReferenceServiceFunctionalExpressionSearch" internal="true"/>
-    <action class="com.intellij.compiler.backwardRefs.view.TestCompilerRefInheritanceAction" id="TestCompilerReferenceServiceInheritance" internal="true"/>
-
-    <action id="MethodOverloadSwitchUp" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchUpAction"/>
-    <action id="MethodOverloadSwitchDown" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchDownAction" />
-
-    <action class="com.intellij.find.findUsages.GroupByPackageAction" id="UsageGrouping.Package" use-shortcut-of="UsageGrouping.Directory">
-      <add-to-group group-id="UsageGroupingActionGroup"/>
-    </action>
-
-    <action id="DevKit.Bootstrap" class="com.intellij.java.devkit.CreatePluginAction"
-            icon="AllIcons.Nodes.Plugin">
-      <add-to-group group-id="ToolsMenu" anchor="last"/>
-      <synonym key="action.DevKit.Bootstrap.synonym"/>
-    </action>
-  </actions>
-</idea-plugin>