diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 4e41c4192eef..1d570ccc7349 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -285,7 +285,7 @@
                     interface="com.intellij.jarRepository.JarRepositoryAuthenticationDataProvider" dynamic="true"/>
     <extensionPoint qualifiedName="com.intellij.jpsServerAuthExtension" interface="com.intellij.compiler.cache.client.JpsServerAuthExtension" dynamic="true"/>
     <extensionPoint qualifiedName="com.intellij.execution.applicationRunLineMarkerHider" interface="com.intellij.execution.ApplicationRunLineMarkerHider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.logging.JvmLogger" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.lang.logging.JvmLogger" dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -790,7 +790,7 @@
     <projectConfigurable parentId="project.propDebugger" instance="com.intellij.debugger.settings.CaptureConfigurable"
                          key="async.stacktraces.configurable.display.name" bundle="messages.JavaDebuggerBundle"/>
 
-    <projectConfigurable id="jvm.logging" parentId="language" instance="com.intellij.settings.JvmLoggingConfigurable"
+    <projectConfigurable id="jvm.logging" parentId="language" instance="com.intellij.ui.logging.JvmLoggingConfigurable"
                          bundle="messages.JavaBundle" key="jvm.logging.configurable.display.name"/>
 
     <xdebugger.attachDebuggerProvider implementation="com.intellij.debugger.impl.attach.JavaAttachDebuggerProvider"/>
@@ -918,11 +918,11 @@
 
     <programRunner id="defaultDebugRunner" implementation="com.intellij.debugger.impl.GenericDebuggerRunner" order="last"/>
 
-    <jvm.logging implementation="com.intellij.logging.ApacheCommonsLogger"/>
-    <jvm.logging implementation="com.intellij.logging.Log4j2Logger"/>
-    <jvm.logging implementation="com.intellij.logging.Log4jLogger"/>
-    <jvm.logging implementation="com.intellij.logging.Slf4jLogger"/>
-    <jvm.logging implementation="com.intellij.logging.UnspecifiedLogger"/>
+    <jvm.logging implementation="com.intellij.lang.logging.ApacheCommonsLogger"/>
+    <jvm.logging implementation="com.intellij.lang.logging.Log4j2Logger"/>
+    <jvm.logging implementation="com.intellij.lang.logging.Log4jLogger"/>
+    <jvm.logging implementation="com.intellij.lang.logging.Slf4jLogger"/>
+    <jvm.logging implementation="com.intellij.lang.logging.UnspecifiedLogger"/>
 
     <javaModuleSystem implementation="com.intellij.psi.impl.JavaPlatformModuleSystem"/>
     <java.error.fix errorCode="lambda.variable.must.be.final" implementationClass="com.intellij.codeInspection.streamMigration.SimplifyForEachInspection$ForEachNonFinalFix"/>
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt
index 3a18a06d188c..382306e5f384 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateLoggerHandler.kt
@@ -4,8 +4,8 @@ package com.intellij.codeInsight.generation
 import com.intellij.codeInsight.CodeInsightActionHandler
 import com.intellij.codeInsight.generation.ui.ChooseLoggerDialogWrapper
 import com.intellij.java.JavaBundle
-import com.intellij.logging.JvmLogger
-import com.intellij.logging.UnspecifiedLogger
+import com.intellij.lang.logging.JvmLogger
+import com.intellij.lang.logging.UnspecifiedLogger
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.components.service
@@ -21,7 +21,7 @@ import com.intellij.psi.util.parentsOfType
 import com.intellij.refactoring.IntroduceTargetChooser
 import com.intellij.refactoring.introduce.PsiIntroduceTarget
 import com.intellij.refactoring.suggested.endOffset
-import com.intellij.settings.JavaSettingsStorage
+import com.intellij.ui.logging.JavaSettingsStorage
 import org.jetbrains.java.generate.GenerationUtil
 
 class GenerateLoggerHandler : CodeInsightActionHandler {
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/ChooseLoggerDialogWrapper.kt b/java/java-impl/src/com/intellij/codeInsight/generation/ui/ChooseLoggerDialogWrapper.kt
index 2b0c505f6ec2..4ccb889bbcb7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/ChooseLoggerDialogWrapper.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/ChooseLoggerDialogWrapper.kt
@@ -7,9 +7,9 @@ import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.DialogWrapper
-import com.intellij.settings.JavaLoggerModel
-import com.intellij.settings.JavaSettingsStorage
-import com.intellij.settings.JvmLoggingConfigurable
+import com.intellij.ui.logging.JavaLoggerModel
+import com.intellij.ui.logging.JavaSettingsStorage
+import com.intellij.ui.logging.JvmLoggingConfigurable
 import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.panel
 import org.jetbrains.annotations.Nls
diff --git a/java/java-impl/src/com/intellij/logging/ApacheCommonsLogger.kt b/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt
similarity index 92%
rename from java/java-impl/src/com/intellij/logging/ApacheCommonsLogger.kt
rename to java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt
index fc1d28d91e55..ddc07e751394 100644
--- a/java/java-impl/src/com/intellij/logging/ApacheCommonsLogger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
diff --git a/java/java-impl/src/com/intellij/logging/JvmLogger.kt b/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt
similarity index 96%
rename from java/java-impl/src/com/intellij/logging/JvmLogger.kt
rename to java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt
index 92071e970917..c0af65815da7 100644
--- a/java/java-impl/src/com/intellij/logging/JvmLogger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
-import com.intellij.logging.UnspecifiedLogger.Companion.UNSPECIFIED_LOGGER_NAME
+import com.intellij.lang.logging.UnspecifiedLogger.Companion.UNSPECIFIED_LOGGER_NAME
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
diff --git a/java/java-impl/src/com/intellij/logging/JvmLoggerFieldDelegate.kt b/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt
similarity index 98%
rename from java/java-impl/src/com/intellij/logging/JvmLoggerFieldDelegate.kt
rename to java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt
index 64bbd987fd3c..d6824b5741ae 100644
--- a/java/java-impl/src/com/intellij/logging/JvmLoggerFieldDelegate.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.intellij.java.library.JavaLibraryUtil
 import com.intellij.openapi.module.Module
diff --git a/java/java-impl/src/com/intellij/logging/Log4j2Logger.kt b/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt
similarity index 91%
rename from java/java-impl/src/com/intellij/logging/Log4j2Logger.kt
rename to java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt
index f717a170ff17..d5e31db18cfb 100644
--- a/java/java-impl/src/com/intellij/logging/Log4j2Logger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
diff --git a/java/java-impl/src/com/intellij/logging/Log4jLogger.kt b/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt
similarity index 91%
rename from java/java-impl/src/com/intellij/logging/Log4jLogger.kt
rename to java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt
index ad292702d744..9b2ff0f6364a 100644
--- a/java/java-impl/src/com/intellij/logging/Log4jLogger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
diff --git a/java/java-impl/src/com/intellij/logging/Slf4jLogger.kt b/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt
similarity index 91%
rename from java/java-impl/src/com/intellij/logging/Slf4jLogger.kt
rename to java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt
index 0edec302b818..5993e2e54ef0 100644
--- a/java/java-impl/src/com/intellij/logging/Slf4jLogger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
diff --git a/java/java-impl/src/com/intellij/logging/UnspecifiedLogger.kt b/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt
similarity index 97%
rename from java/java-impl/src/com/intellij/logging/UnspecifiedLogger.kt
rename to java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt
index 4bf012c45832..28476ea6bc27 100644
--- a/java/java-impl/src/com/intellij/logging/UnspecifiedLogger.kt
+++ b/java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.logging
+package com.intellij.lang.logging
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
diff --git a/java/java-impl/src/com/intellij/settings/JavaLoggerModel.kt b/java/java-impl/src/com/intellij/ui/logging/JavaLoggerModel.kt
similarity index 96%
rename from java/java-impl/src/com/intellij/settings/JavaLoggerModel.kt
rename to java/java-impl/src/com/intellij/ui/logging/JavaLoggerModel.kt
index 1ad3223a87f9..d72a031a4e06 100644
--- a/java/java-impl/src/com/intellij/settings/JavaLoggerModel.kt
+++ b/java/java-impl/src/com/intellij/ui/logging/JavaLoggerModel.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.settings
+package com.intellij.ui.logging
 
 import javax.swing.AbstractListModel
 import javax.swing.ComboBoxModel
diff --git a/java/java-impl/src/com/intellij/settings/JavaSettingsManager.kt b/java/java-impl/src/com/intellij/ui/logging/JavaSettingsManager.kt
similarity index 86%
rename from java/java-impl/src/com/intellij/settings/JavaSettingsManager.kt
rename to java/java-impl/src/com/intellij/ui/logging/JavaSettingsManager.kt
index 14682d1f4919..c434a83b78f1 100644
--- a/java/java-impl/src/com/intellij/settings/JavaSettingsManager.kt
+++ b/java/java-impl/src/com/intellij/ui/logging/JavaSettingsManager.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.settings
+package com.intellij.ui.logging
 
-import com.intellij.logging.UnspecifiedLogger
+import com.intellij.lang.logging.UnspecifiedLogger
 import com.intellij.openapi.components.*
 
 @Service(Service.Level.PROJECT)
diff --git a/java/java-impl/src/com/intellij/settings/JvmLoggingConfigurable.kt b/java/java-impl/src/com/intellij/ui/logging/JvmLoggingConfigurable.kt
similarity index 94%
rename from java/java-impl/src/com/intellij/settings/JvmLoggingConfigurable.kt
rename to java/java-impl/src/com/intellij/ui/logging/JvmLoggingConfigurable.kt
index 14ce6e35a4bd..978e0d9425b7 100644
--- a/java/java-impl/src/com/intellij/settings/JvmLoggingConfigurable.kt
+++ b/java/java-impl/src/com/intellij/ui/logging/JvmLoggingConfigurable.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.settings
+package com.intellij.ui.logging
 
 import com.intellij.icons.AllIcons
 import com.intellij.java.JavaBundle
-import com.intellij.logging.JvmLogger
-import com.intellij.logging.UnspecifiedLogger
+import com.intellij.lang.logging.JvmLogger
+import com.intellij.lang.logging.UnspecifiedLogger
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.components.service
@@ -25,7 +25,7 @@ class JvmLoggingConfigurable(private val project: Project) : SearchableConfigura
 
   override fun getDisplayName(): String = JavaBundle.message("jvm.logging.configurable.display.name")
 
-  override fun getId(): String = JavaBundle.message("jvm.logging.configurable.display.name")
+  override fun getId(): String = JavaBundle.message("jvm.logging.configurable.id")
 
   override fun createComponent(): JComponent {
     val isOnlyOnStartup = JvmLogger.getAllLoggersNames(settings.loggerName == UnspecifiedLogger.UNSPECIFIED_LOGGER_NAME)
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateLoggerTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateLoggerTest.kt
index 7dbc84ddc1b0..e3282c0c3468 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateLoggerTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/GenerateLoggerTest.kt
@@ -3,18 +3,18 @@ package com.intellij.java.codeInsight
 
 import com.intellij.JavaTestUtil
 import com.intellij.codeInsight.generation.GenerateLoggerHandler
-import com.intellij.logging.UnspecifiedLogger
+import com.intellij.lang.logging.UnspecifiedLogger
 import com.intellij.openapi.components.service
 import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.util.Disposer
 import com.intellij.psi.PsiClass
 import com.intellij.refactoring.introduce.PsiIntroduceTarget
-import com.intellij.settings.JavaSettingsStorage
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import com.intellij.ui.UiInterceptors
 import com.intellij.ui.UiInterceptors.UiInterceptor
 import com.intellij.ui.components.JBList
+import com.intellij.ui.logging.JavaSettingsStorage
 import com.intellij.util.ui.UIUtil
 import junit.framework.TestCase
 import javax.swing.ListModel
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt
index e078dbfd72cc..e1a3fcc2c6fe 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt
@@ -1,7 +1,7 @@
 package de.plushnikov.intellij.plugin.logging
 
 import com.intellij.java.library.JavaLibraryUtil
-import com.intellij.logging.JvmLogger
+import com.intellij.lang.logging.JvmLogger
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt
index 793a58ccef50..4ae79a9c7f99 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt
@@ -1,6 +1,6 @@
 package de.plushnikov.intellij.plugin.logging
 
-import com.intellij.logging.JvmLogger
+import com.intellij.lang.logging.JvmLogger
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
 class LombokApacheCommonsLogger : JvmLogger by JvmLoggerAnnotationDelegate(
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt
index 3225a8ee36f5..f58ceedaa915 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt
@@ -1,6 +1,6 @@
 package de.plushnikov.intellij.plugin.logging
 
-import com.intellij.logging.JvmLogger
+import com.intellij.lang.logging.JvmLogger
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
 class LombokLog4j2Logger : JvmLogger by JvmLoggerAnnotationDelegate(
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt
index d658c945d22f..22f39862fb0e 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt
@@ -1,6 +1,6 @@
 package de.plushnikov.intellij.plugin.logging
 
-import com.intellij.logging.JvmLogger
+import com.intellij.lang.logging.JvmLogger
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
 class LombokLog4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt
index 8250b9746c0b..78f8d058edea 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt
@@ -1,6 +1,6 @@
 package de.plushnikov.intellij.plugin.logging
 
-import com.intellij.logging.JvmLogger
+import com.intellij.lang.logging.JvmLogger
 import com.siyeh.ig.psiutils.JavaLoggingUtils
 
 class LombokSlf4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(