diff --git a/.idea/modules.xml b/.idea/modules.xml
index 483aae15086a..ea8fc027b503 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -670,6 +670,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/ide-core-impl/intellij.platform.ide.core.impl.iml" filepath="$PROJECT_DIR$/platform/ide-core-impl/intellij.platform.ide.core.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/designer/intellij.platform.ide.designer.iml" filepath="$PROJECT_DIR$/platform/platform-impl/designer/intellij.platform.ide.designer.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/platform-impl/internal/intellij.platform.ide.internal.iml" filepath="$PROJECT_DIR$/platform/platform-impl/internal/intellij.platform.ide.internal.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml" filepath="$PROJECT_DIR$/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml" filepath="$PROJECT_DIR$/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/progress/shared/intellij.platform.ide.progress.iml" filepath="$PROJECT_DIR$/platform/progress/shared/intellij.platform.ide.progress.iml" />
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 5c16eab52e77..7190044daf9b 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -73,6 +73,7 @@
     <orderEntry type="module" module-name="intellij.platform.ml" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" exported="" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt b/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
index f317f0f6b00c..725a465fe4a7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ml/JavaMLRankingProvider.kt
@@ -6,7 +6,9 @@ import com.intellij.internal.ml.completion.DecoratingItemsPolicy
 import com.intellij.java.JavaBundle
 import com.intellij.lang.Language
 import com.intellij.lang.java.JavaLanguage
+import org.jetbrains.annotations.ApiStatus
 
+@ApiStatus.Internal
 class JavaMLRankingProvider : CatBoostJarCompletionModelProvider(JavaBundle.message("settings.completion.ml.java.display.name"),
                                                                  "java_features", "java_model") {
 
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index e4bd351c8ce5..9088038e0588 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -42,6 +42,7 @@
     <orderEntry type="library" scope="TEST" name="easymock" level="project" />
     <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index b70f4512d4ed..2327151057c5 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -95,6 +95,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
   // todo not used by platform - move to plugin
   "intellij.platform.ide.designer",
   "intellij.platform.ide.remote",
+  "intellij.platform.ide.internal",
 )
 
 @Suppress("RemoveRedundantQualifierName")
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 410b2dbaf4d4..85ba4eded3be 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -102,6 +102,7 @@
     <orderEntry type="module" module-name="intellij.platform.backend.observation" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.io.storages" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/ml-impl/intellij.platform.ml.impl.iml b/platform/ml-impl/intellij.platform.ml.impl.iml
index 1c2cdee72e1c..ca849d9e4612 100644
--- a/platform/ml-impl/intellij.platform.ml.impl.iml
+++ b/platform/ml-impl/intellij.platform.ml.impl.iml
@@ -40,6 +40,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt
index e77cefeaef57..5cd557a3761b 100644
--- a/platform/platform-impl/api-dump-unreviewed.txt
+++ b/platform/platform-impl/api-dump-unreviewed.txt
@@ -6270,160 +6270,10 @@ f:com.intellij.internal.DebugAttachDetector
 - <init>():V
 - s:isAttached():Z
 - s:isDebugEnabled():Z
-f:com.intellij.internal.cachedValueProfiler.CachedValueProfilerDumpHelper
-- s:loadDump(java.io.File,com.intellij.psi.util.CachedValueProfiler$EventConsumer):V
-com.intellij.internal.cachedValueProfiler.CachedValueProfilerDumpHelper$EventConsumerFactory
-- a:createEventConsumer():com.intellij.psi.util.CachedValueProfiler$EventConsumer
-f:com.intellij.internal.ml.BagOfWordsFeature
-- sf:Companion:com.intellij.internal.ml.BagOfWordsFeature$Companion
-- sf:MAX_CACHE_SIZE:I
-- sf:UNDEFINED:java.lang.String
-- <init>(java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor):V
-- f:component1():java.lang.String
-- f:component2():java.util.Set
-- f:component3():com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
-- f:copy(java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor):com.intellij.internal.ml.BagOfWordsFeature
-- bs:copy$default(com.intellij.internal.ml.BagOfWordsFeature,java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor,I,java.lang.Object):com.intellij.internal.ml.BagOfWordsFeature
-- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
-- equals(java.lang.Object):Z
-- getName():java.lang.String
-- f:getSplitterDescriptor():com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
-- f:getWords():java.util.Set
-- hashCode():I
-f:com.intellij.internal.ml.BagOfWordsFeature$Companion
-f:com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
-- <init>(Z,Z):V
-- f:component1():Z
-- f:component2():Z
-- f:copy(Z,Z):com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
-- bs:copy$default(com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor,Z,Z,I,java.lang.Object):com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
-- equals(java.lang.Object):Z
-- f:getToLowerCase():Z
-- f:getWithStemming():Z
-- hashCode():I
-f:com.intellij.internal.ml.BinaryFeature
-- <init>(java.lang.String,kotlin.Pair,kotlin.Pair,D,Z):V
-- f:component1():java.lang.String
-- f:component2():kotlin.Pair
-- f:component3():kotlin.Pair
-- f:component4():D
-- f:component5():Z
-- f:copy(java.lang.String,kotlin.Pair,kotlin.Pair,D,Z):com.intellij.internal.ml.BinaryFeature
-- bs:copy$default(com.intellij.internal.ml.BinaryFeature,java.lang.String,kotlin.Pair,kotlin.Pair,D,Z,I,java.lang.Object):com.intellij.internal.ml.BinaryFeature
-- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
-- equals(java.lang.Object):Z
-- f:getAllowUndefined():Z
-- f:getDefaultValue():D
-- f:getFirstValueMapping():kotlin.Pair
-- getName():java.lang.String
-- f:getSecondValueMapping():kotlin.Pair
-- hashCode():I
-f:com.intellij.internal.ml.CategoricalFeature
-- sf:Companion:com.intellij.internal.ml.CategoricalFeature$Companion
-- sf:OTHER:java.lang.String
-- <init>(java.lang.String,java.util.Set):V
-- f:component1():java.lang.String
-- f:component2():java.util.Set
-- f:copy(java.lang.String,java.util.Set):com.intellij.internal.ml.CategoricalFeature
-- bs:copy$default(com.intellij.internal.ml.CategoricalFeature,java.lang.String,java.util.Set,I,java.lang.Object):com.intellij.internal.ml.CategoricalFeature
-- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
-- equals(java.lang.Object):Z
-- f:getCategories():java.util.Set
-- getName():java.lang.String
-- hashCode():I
-f:com.intellij.internal.ml.CategoricalFeature$Companion
-f:com.intellij.internal.ml.FloatFeature
-- <init>(java.lang.String,D,Z):V
-- f:component1():java.lang.String
-- f:component2():D
-- f:component3():Z
-- f:copy(java.lang.String,D,Z):com.intellij.internal.ml.FloatFeature
-- bs:copy$default(com.intellij.internal.ml.FloatFeature,java.lang.String,D,Z,I,java.lang.Object):com.intellij.internal.ml.FloatFeature
-- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
-- equals(java.lang.Object):Z
-- f:getAllowUndefined():Z
-- f:getDefaultValue():D
-- getName():java.lang.String
-- hashCode():I
-f:com.intellij.internal.ml.InconsistentMetadataException
-- java.lang.IllegalStateException
-- <init>(java.lang.String):V
-com.intellij.internal.ml.ModelMetadata
-- a:getBinaryFeatures():java.util.List
-- a:getCategoricalFeatures():java.util.List
-- a:getFeaturesOrder():com.intellij.internal.ml.FeatureMapper[]
-- a:getFloatFeatures():java.util.List
-- a:getKnownFeatures():java.util.Set
-- a:getVersion():java.lang.String
-com.intellij.internal.ml.ModelMetadataReader
-- a:allKnown():java.lang.String
-- a:binaryFeatures():java.lang.String
-- a:categoricalFeatures():java.lang.String
-- a:extractVersion():java.lang.String
-- a:featureOrderDirect():java.util.List
-- a:floatFeatures():java.lang.String
-c:com.intellij.internal.ml.ResourcesModelMetadataReader
-- com.intellij.internal.ml.ModelMetadataReader
-- <init>(java.lang.Class,java.lang.String):V
-- allKnown():java.lang.String
-- binaryFeatures():java.lang.String
-- categoricalFeatures():java.lang.String
-- extractVersion():java.lang.String
-- featureOrderDirect():java.util.List
-- floatFeatures():java.lang.String
-- pf:getMetadataHolder():java.lang.Class
-a:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider
-- sf:Companion:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider$Companion
-- <init>(java.lang.String,java.lang.String,java.lang.String):V
-- f:assertModelMetadataConsistent():V
-- getDisplayNameInSettings():java.lang.String
-- getModel():com.intellij.internal.ml.DecisionFunction
-- f:getModelDirectory():java.lang.String
-- f:getResourceDirectory():java.lang.String
-f:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider$Companion
-f:com.intellij.internal.ml.catboost.CatBoostResourcesModelMetadataReader
-- com.intellij.internal.ml.ResourcesModelMetadataReader
-- <init>(java.lang.Class,java.lang.String,java.lang.String):V
-- f:loadModel():com.intellij.internal.ml.catboost.NaiveCatBoostModel
-f:com.intellij.internal.ml.catboost.NaiveCatBoostModel
-- s:loadModel(java.io.InputStream):com.intellij.internal.ml.catboost.NaiveCatBoostModel
-- makePredict(D[]):D
-a:com.intellij.internal.ml.completion.CompletionRankingModelBase
-- <init>(com.intellij.internal.ml.ModelMetadata):V
-- getFeaturesOrder():com.intellij.internal.ml.FeatureMapper[]
-- getRequiredFeatures():java.util.List
-- getUnknownFeatures(java.util.Collection):java.util.List
-- version():java.lang.String
-com.intellij.internal.ml.completion.DecoratingItemsPolicy
-- sf:Companion:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Companion
-- a:itemsToDecorate(java.lang.Iterable):java.util.Set
-f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$ByAbsoluteThreshold
-- com.intellij.internal.ml.completion.DecoratingItemsPolicy
-- <init>(D):V
-- itemsToDecorate(java.lang.Iterable):java.util.Set
-f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$ByRelativeThreshold
-- com.intellij.internal.ml.completion.DecoratingItemsPolicy
-- <init>(D):V
-- itemsToDecorate(java.lang.Iterable):java.util.Set
-f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Companion
-- f:getDISABLED():com.intellij.internal.ml.completion.DecoratingItemsPolicy
-f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Composite
-- com.intellij.internal.ml.completion.DecoratingItemsPolicy
-- <init>(com.intellij.internal.ml.completion.DecoratingItemsPolicy[]):V
-- itemsToDecorate(java.lang.Iterable):java.util.Set
-f:com.intellij.internal.performance.LatencyRecord
+f:com.intellij.internal.statistic.collectors.fus.ui.GotItTooltipAllowlistEP
 - <init>():V
-- f:getAverageLatency():J
-- f:getMaxLatency():I
-- f:getSamples():it.unimi.dsi.fastutil.ints.IntArrayList
-- f:getTotalLatency():J
-- f:percentile(I):I
-- f:setMaxLatency(I):V
-- f:setTotalLatency(J):V
-- f:update(I):V
-com.intellij.internal.statistic.fileTypes.FileTypeStatisticProvider
-- a:accept(com.intellij.openapi.editor.Editor,com.intellij.openapi.fileTypes.FileType):Z
-- a:getPluginId():java.lang.String
+- f:getPrefix():java.lang.String
+- f:setPrefix(java.lang.String):V
 f:com.intellij.notification.ActionCenter
 - sf:EVENT_REQUESTOR:java.lang.String
 - sf:MODEL_CHANGED:com.intellij.util.messages.Topic
@@ -12500,6 +12350,29 @@ a:com.intellij.openapi.wm.impl.VisibilityWatcher
 - f:install(java.awt.Component):V
 - f:propertyChange(java.beans.PropertyChangeEvent):V
 - a:visibilityChanged():V
+f:com.intellij.openapi.wm.impl.WindowButtonsConfiguration
+- com.intellij.openapi.components.PersistentStateComponent
+- sf:Companion:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$Companion
+- <init>(kotlinx.coroutines.CoroutineScope):V
+- getState():com.intellij.openapi.wm.impl.WindowButtonsConfiguration$State
+- f:getStateFlow():kotlinx.coroutines.flow.StateFlow
+- loadState(com.intellij.openapi.wm.impl.WindowButtonsConfiguration$State):V
+- noStateLoaded():V
+- f:scheduleUpdateFromOs():V
+f:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$Companion
+- f:getInstance():com.intellij.openapi.wm.impl.WindowButtonsConfiguration
+f:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$State
+- buttons:java.util.List
+- rightPosition:Z
+- <init>():V
+e:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton
+- java.lang.Enum
+- sf:CLOSE:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton
+- sf:MAXIMIZE:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton
+- sf:MINIMIZE:com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton
+- s:getEntries():kotlin.enums.EnumEntries
+- s:valueOf(java.lang.String):com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton
+- s:values():com.intellij.openapi.wm.impl.WindowButtonsConfiguration$WindowButton[]
 f:com.intellij.openapi.wm.impl.WindowInfoImpl
 - com.intellij.openapi.components.BaseState
 - com.intellij.openapi.wm.WindowInfo
diff --git a/platform/platform-impl/exposed-private-api.txt b/platform/platform-impl/exposed-private-api.txt
index 34e5b143ec41..3a43a8fa38ae 100644
--- a/platform/platform-impl/exposed-private-api.txt
+++ b/platform/platform-impl/exposed-private-api.txt
@@ -10,8 +10,6 @@ com/intellij/ide/plugins/IdeaPluginDescriptorImpl
 com/intellij/ide/plugins/marketplace/MarketplacePluginDownloadService
 com/intellij/ide/ui/LafReference
 com/intellij/ide/ui/laf/UIThemeExportableBean
-com/intellij/internal/ml/DecisionFunction
-com/intellij/internal/ml/FeatureMapper
 com/intellij/openapi/actionSystem/ex/ActionRuntimeRegistrar
 com/intellij/openapi/actionSystem/impl/SuspendingUpdateSession
 com/intellij/openapi/client/ClientAppSession
@@ -35,7 +33,6 @@ com/intellij/openapi/wm/impl/IdeFrameImpl
 com/intellij/openapi/wm/impl/ToolWindowImpl
 com/intellij/openapi/wm/impl/status/InlineProgressIndicator$ProgressButton
 com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreenComponentFactory$JActionLinkPanel
-com/intellij/psi/util/CachedValueProfiler$EventConsumer
 com/intellij/serialization/MutableAccessor
 com/intellij/toolWindow/ToolWindowToolbar
 com/intellij/ui/BadgeIconSupplier
diff --git a/platform/platform-impl/exposed-third-party-api.txt b/platform/platform-impl/exposed-third-party-api.txt
index aa838d696aac..9cb3606cb698 100644
--- a/platform/platform-impl/exposed-third-party-api.txt
+++ b/platform/platform-impl/exposed-third-party-api.txt
@@ -8,7 +8,6 @@ com/intellij/util/ui/MenuItemLayoutHelper
 com/intellij/util/ui/MenuItemLayoutHelper$LayoutResult
 com/sun/jna/Structure
 io/netty/buffer/ByteBuf
-it/unimi/dsi/fastutil/ints/IntArrayList
 it/unimi/dsi/fastutil/ints/IntSet
 it/unimi/dsi/fastutil/longs/Long2ObjectMap
 it/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index db61f53777e8..6da2701e9551 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -86,7 +86,6 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="zip-signer" level="project" />
     <orderEntry type="library" name="caffeine" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.statistics.uploader" />
     <orderEntry type="library" name="classgraph" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />
diff --git a/platform/platform-impl/internal/api-dump-unreviewed.txt b/platform/platform-impl/internal/api-dump-unreviewed.txt
new file mode 100644
index 000000000000..8170ad4ec9ac
--- /dev/null
+++ b/platform/platform-impl/internal/api-dump-unreviewed.txt
@@ -0,0 +1,154 @@
+f:com.intellij.internal.cachedValueProfiler.CachedValueProfilerDumpHelper
+- s:loadDump(java.io.File,com.intellij.psi.util.CachedValueProfiler$EventConsumer):V
+com.intellij.internal.cachedValueProfiler.CachedValueProfilerDumpHelper$EventConsumerFactory
+- a:createEventConsumer():com.intellij.psi.util.CachedValueProfiler$EventConsumer
+f:com.intellij.internal.ml.BagOfWordsFeature
+- sf:Companion:com.intellij.internal.ml.BagOfWordsFeature$Companion
+- sf:MAX_CACHE_SIZE:I
+- sf:UNDEFINED:java.lang.String
+- <init>(java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor):V
+- f:component1():java.lang.String
+- f:component2():java.util.Set
+- f:component3():com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
+- f:copy(java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor):com.intellij.internal.ml.BagOfWordsFeature
+- bs:copy$default(com.intellij.internal.ml.BagOfWordsFeature,java.lang.String,java.util.Set,com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor,I,java.lang.Object):com.intellij.internal.ml.BagOfWordsFeature
+- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
+- equals(java.lang.Object):Z
+- getName():java.lang.String
+- f:getSplitterDescriptor():com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
+- f:getWords():java.util.Set
+- hashCode():I
+f:com.intellij.internal.ml.BagOfWordsFeature$Companion
+f:com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
+- <init>(Z,Z):V
+- f:component1():Z
+- f:component2():Z
+- f:copy(Z,Z):com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
+- bs:copy$default(com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor,Z,Z,I,java.lang.Object):com.intellij.internal.ml.BagOfWordsFeature$SplitterDescriptor
+- equals(java.lang.Object):Z
+- f:getToLowerCase():Z
+- f:getWithStemming():Z
+- hashCode():I
+f:com.intellij.internal.ml.BinaryFeature
+- <init>(java.lang.String,kotlin.Pair,kotlin.Pair,D,Z):V
+- f:component1():java.lang.String
+- f:component2():kotlin.Pair
+- f:component3():kotlin.Pair
+- f:component4():D
+- f:component5():Z
+- f:copy(java.lang.String,kotlin.Pair,kotlin.Pair,D,Z):com.intellij.internal.ml.BinaryFeature
+- bs:copy$default(com.intellij.internal.ml.BinaryFeature,java.lang.String,kotlin.Pair,kotlin.Pair,D,Z,I,java.lang.Object):com.intellij.internal.ml.BinaryFeature
+- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
+- equals(java.lang.Object):Z
+- f:getAllowUndefined():Z
+- f:getDefaultValue():D
+- f:getFirstValueMapping():kotlin.Pair
+- getName():java.lang.String
+- f:getSecondValueMapping():kotlin.Pair
+- hashCode():I
+f:com.intellij.internal.ml.CategoricalFeature
+- sf:Companion:com.intellij.internal.ml.CategoricalFeature$Companion
+- sf:OTHER:java.lang.String
+- <init>(java.lang.String,java.util.Set):V
+- f:component1():java.lang.String
+- f:component2():java.util.Set
+- f:copy(java.lang.String,java.util.Set):com.intellij.internal.ml.CategoricalFeature
+- bs:copy$default(com.intellij.internal.ml.CategoricalFeature,java.lang.String,java.util.Set,I,java.lang.Object):com.intellij.internal.ml.CategoricalFeature
+- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
+- equals(java.lang.Object):Z
+- f:getCategories():java.util.Set
+- getName():java.lang.String
+- hashCode():I
+f:com.intellij.internal.ml.CategoricalFeature$Companion
+f:com.intellij.internal.ml.FloatFeature
+- <init>(java.lang.String,D,Z):V
+- f:component1():java.lang.String
+- f:component2():D
+- f:component3():Z
+- f:copy(java.lang.String,D,Z):com.intellij.internal.ml.FloatFeature
+- bs:copy$default(com.intellij.internal.ml.FloatFeature,java.lang.String,D,Z,I,java.lang.Object):com.intellij.internal.ml.FloatFeature
+- createMapper(java.lang.String):com.intellij.internal.ml.FeatureMapper
+- equals(java.lang.Object):Z
+- f:getAllowUndefined():Z
+- f:getDefaultValue():D
+- getName():java.lang.String
+- hashCode():I
+f:com.intellij.internal.ml.InconsistentMetadataException
+- java.lang.IllegalStateException
+- <init>(java.lang.String):V
+com.intellij.internal.ml.ModelMetadata
+- a:getBinaryFeatures():java.util.List
+- a:getCategoricalFeatures():java.util.List
+- a:getFeaturesOrder():com.intellij.internal.ml.FeatureMapper[]
+- a:getFloatFeatures():java.util.List
+- a:getKnownFeatures():java.util.Set
+- a:getVersion():java.lang.String
+com.intellij.internal.ml.ModelMetadataReader
+- a:allKnown():java.lang.String
+- a:binaryFeatures():java.lang.String
+- a:categoricalFeatures():java.lang.String
+- a:extractVersion():java.lang.String
+- a:featureOrderDirect():java.util.List
+- a:floatFeatures():java.lang.String
+c:com.intellij.internal.ml.ResourcesModelMetadataReader
+- com.intellij.internal.ml.ModelMetadataReader
+- <init>(java.lang.Class,java.lang.String):V
+- allKnown():java.lang.String
+- binaryFeatures():java.lang.String
+- categoricalFeatures():java.lang.String
+- extractVersion():java.lang.String
+- featureOrderDirect():java.util.List
+- floatFeatures():java.lang.String
+- pf:getMetadataHolder():java.lang.Class
+a:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider
+- sf:Companion:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider$Companion
+- <init>(java.lang.String,java.lang.String,java.lang.String):V
+- f:assertModelMetadataConsistent():V
+- getDisplayNameInSettings():java.lang.String
+- getModel():com.intellij.internal.ml.DecisionFunction
+- f:getModelDirectory():java.lang.String
+- f:getResourceDirectory():java.lang.String
+f:com.intellij.internal.ml.catboost.CatBoostJarCompletionModelProvider$Companion
+f:com.intellij.internal.ml.catboost.CatBoostResourcesModelMetadataReader
+- com.intellij.internal.ml.ResourcesModelMetadataReader
+- <init>(java.lang.Class,java.lang.String,java.lang.String):V
+- f:loadModel():com.intellij.internal.ml.catboost.NaiveCatBoostModel
+f:com.intellij.internal.ml.catboost.NaiveCatBoostModel
+- s:loadModel(java.io.InputStream):com.intellij.internal.ml.catboost.NaiveCatBoostModel
+- makePredict(D[]):D
+a:com.intellij.internal.ml.completion.CompletionRankingModelBase
+- <init>(com.intellij.internal.ml.ModelMetadata):V
+- getFeaturesOrder():com.intellij.internal.ml.FeatureMapper[]
+- getRequiredFeatures():java.util.List
+- getUnknownFeatures(java.util.Collection):java.util.List
+- version():java.lang.String
+com.intellij.internal.ml.completion.DecoratingItemsPolicy
+- sf:Companion:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Companion
+- a:itemsToDecorate(java.lang.Iterable):java.util.Set
+f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$ByAbsoluteThreshold
+- com.intellij.internal.ml.completion.DecoratingItemsPolicy
+- <init>(D):V
+- itemsToDecorate(java.lang.Iterable):java.util.Set
+f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$ByRelativeThreshold
+- com.intellij.internal.ml.completion.DecoratingItemsPolicy
+- <init>(D):V
+- itemsToDecorate(java.lang.Iterable):java.util.Set
+f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Companion
+- f:getDISABLED():com.intellij.internal.ml.completion.DecoratingItemsPolicy
+f:com.intellij.internal.ml.completion.DecoratingItemsPolicy$Composite
+- com.intellij.internal.ml.completion.DecoratingItemsPolicy
+- <init>(com.intellij.internal.ml.completion.DecoratingItemsPolicy[]):V
+- itemsToDecorate(java.lang.Iterable):java.util.Set
+f:com.intellij.internal.performance.LatencyRecord
+- <init>():V
+- f:getAverageLatency():J
+- f:getMaxLatency():I
+- f:getSamples():it.unimi.dsi.fastutil.ints.IntArrayList
+- f:getTotalLatency():J
+- f:percentile(I):I
+- f:setMaxLatency(I):V
+- f:setTotalLatency(J):V
+- f:update(I):V
+com.intellij.internal.statistic.fileTypes.FileTypeStatisticProvider
+- a:accept(com.intellij.openapi.editor.Editor,com.intellij.openapi.fileTypes.FileType):Z
+- a:getPluginId():java.lang.String
diff --git a/platform/platform-impl/internal/exposed-private-api.txt b/platform/platform-impl/internal/exposed-private-api.txt
new file mode 100644
index 000000000000..5143061b38db
--- /dev/null
+++ b/platform/platform-impl/internal/exposed-private-api.txt
@@ -0,0 +1,3 @@
+com/intellij/internal/ml/DecisionFunction
+com/intellij/internal/ml/FeatureMapper
+com/intellij/psi/util/CachedValueProfiler$EventConsumer
diff --git a/platform/platform-impl/internal/exposed-third-party-api.txt b/platform/platform-impl/internal/exposed-third-party-api.txt
new file mode 100644
index 000000000000..9c1e8d260ccc
--- /dev/null
+++ b/platform/platform-impl/internal/exposed-third-party-api.txt
@@ -0,0 +1 @@
+it/unimi/dsi/fastutil/ints/IntArrayList
diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
new file mode 100644
index 000000000000..364b5f5e6501
--- /dev/null
+++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.ui.jcef" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.statistics" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
+    <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
+    <orderEntry type="module" module-name="intellij.platform.jbr" />
+    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.uploader" />
+    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
+    <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
+    <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
+    <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="library" name="hash4j" level="project" />
+    <orderEntry type="library" name="gson" level="project" />
+    <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/InternalFlagDetection.kt b/platform/platform-impl/internal/src/com/intellij/featureStatistics/InternalFlagDetection.kt
similarity index 93%
rename from platform/platform-impl/src/com/intellij/featureStatistics/InternalFlagDetection.kt
rename to platform/platform-impl/internal/src/com/intellij/featureStatistics/InternalFlagDetection.kt
index 20153fafc8ff..98868a57d420 100644
--- a/platform/platform-impl/src/com/intellij/featureStatistics/InternalFlagDetection.kt
+++ b/platform/platform-impl/internal/src/com/intellij/featureStatistics/InternalFlagDetection.kt
@@ -9,12 +9,8 @@ import com.intellij.internal.statistic.utils.StatisticsUploadAssistant
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
-import com.intellij.ui.LicensingFacade
-import org.jetbrains.annotations.ApiStatus
 
-@ApiStatus.Internal
 private class InternalFlagDetection : ProjectActivity {
-
   private val internalPluginIds = setOf(
     "com.jetbrains.intellij.api.watcher",
     "com.jetbrains.idea.safepush",
diff --git a/platform/platform-impl/src/com/intellij/internal/BrowseWebAction.java b/platform/platform-impl/internal/src/com/intellij/internal/BrowseWebAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/BrowseWebAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/BrowseWebAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/CompareKeymapsAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/CompareKeymapsAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/CompareKeymapsAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/CompareKeymapsAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/DumbModeTrembleAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/DumbModeTrembleAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/DumbModeTrembleAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/DumbModeTrembleAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java b/platform/platform-impl/internal/src/com/intellij/internal/GrayFilterConfig.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java
rename to platform/platform-impl/internal/src/com/intellij/internal/GrayFilterConfig.java
diff --git a/platform/platform-impl/src/com/intellij/internal/HidpiInfo.java b/platform/platform-impl/internal/src/com/intellij/internal/HidpiInfo.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/HidpiInfo.java
rename to platform/platform-impl/internal/src/com/intellij/internal/HidpiInfo.java
diff --git a/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java b/platform/platform-impl/internal/src/com/intellij/internal/IconsLoadTime.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
rename to platform/platform-impl/internal/src/com/intellij/internal/IconsLoadTime.java
diff --git a/platform/platform-impl/src/com/intellij/internal/InternalUtil.kt b/platform/platform-impl/internal/src/com/intellij/internal/InternalUtil.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/InternalUtil.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/InternalUtil.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/JBTabsDemoAction.java b/platform/platform-impl/internal/src/com/intellij/internal/JBTabsDemoAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/JBTabsDemoAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/JBTabsDemoAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/JTabbedPaneDemoAction.java b/platform/platform-impl/internal/src/com/intellij/internal/JTabbedPaneDemoAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/JTabbedPaneDemoAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/JTabbedPaneDemoAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/KeymapToCsvAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/KeymapToCsvAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/KeymapToCsvAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/KeymapToCsvAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/LabelSizeDemoAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/LabelSizeDemoAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/LabelSizeDemoAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/LabelSizeDemoAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/OpenLogAction.java b/platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/OpenLogAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/OpenLogAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/PerformGCAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/PerformGCAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/PerformGCAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/PerformGCAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/PrintModulesAndEntitySources.kt b/platform/platform-impl/internal/src/com/intellij/internal/PrintModulesAndEntitySources.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/PrintModulesAndEntitySources.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/PrintModulesAndEntitySources.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ReloadProjectAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ReloadProjectAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ReloadProjectAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ResetGotItTooltips.kt b/platform/platform-impl/internal/src/com/intellij/internal/ResetGotItTooltips.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ResetGotItTooltips.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ResetGotItTooltips.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ShowPoweredProgressAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ShowPoweredProgressAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ShowPoweredProgressAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ShowPoweredProgressAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ShowUpdateInfoDialogAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ShowUpdateInfoDialogAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ShowUpdateInfoDialogAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ShowUpdateInfoDialogAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/SkipWindowDeactivationEventsAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/SkipWindowDeactivationEventsAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/SkipWindowDeactivationEventsAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/SkipWindowDeactivationEventsAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/TestCoroutineProgressAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/TestCoroutineProgressAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TestCoroutineProgressAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/TestCoroutineProgressAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/TestProgressWindow.java b/platform/platform-impl/internal/src/com/intellij/internal/TestProgressWindow.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TestProgressWindow.java
rename to platform/platform-impl/internal/src/com/intellij/internal/TestProgressWindow.java
diff --git a/platform/platform-impl/src/com/intellij/internal/TestTooltipsAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/TestTooltipsAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TestTooltipsAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/TestTooltipsAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/TestWriteActionUnderProgress.java b/platform/platform-impl/internal/src/com/intellij/internal/TestWriteActionUnderProgress.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TestWriteActionUnderProgress.java
rename to platform/platform-impl/internal/src/com/intellij/internal/TestWriteActionUnderProgress.java
diff --git a/platform/platform-impl/src/com/intellij/internal/TextGrayFilterConfig.java b/platform/platform-impl/internal/src/com/intellij/internal/TextGrayFilterConfig.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TextGrayFilterConfig.java
rename to platform/platform-impl/internal/src/com/intellij/internal/TextGrayFilterConfig.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ToggleDumbModeAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ToggleDumbModeAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ToggleIncompleteDependenciesModeAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ToggleIncompleteDependenciesModeAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ToggleIncompleteDependenciesModeAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ToggleIncompleteDependenciesModeAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ToggleLaggingModeAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ToggleLaggingModeAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ToolbarDemoAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ToolbarDemoAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ToolbarDemoAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ToolbarDemoAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/TrustedModeAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/TrustedModeAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/TrustedModeAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/TrustedModeAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/UIFreezeAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/UIFreezeAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/UIFreezeAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/UIFreezeAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java b/platform/platform-impl/internal/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/cachedValueProfiler/CachedValueProfilerDumpHelper.java b/platform/platform-impl/internal/src/com/intellij/internal/cachedValueProfiler/CachedValueProfilerDumpHelper.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/cachedValueProfiler/CachedValueProfilerDumpHelper.java
rename to platform/platform-impl/internal/src/com/intellij/internal/cachedValueProfiler/CachedValueProfilerDumpHelper.java
diff --git a/platform/platform-impl/src/com/intellij/internal/cachedValueProfiler/TurnOnOffCachedValueProfilerAction.java b/platform/platform-impl/internal/src/com/intellij/internal/cachedValueProfiler/TurnOnOffCachedValueProfilerAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/cachedValueProfiler/TurnOnOffCachedValueProfilerAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/cachedValueProfiler/TurnOnOffCachedValueProfilerAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/components/ListPersistentStateComponentsAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/components/ListPersistentStateComponentsAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/components/ListPersistentStateComponentsAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/components/ListPersistentStateComponentsAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/FocusDebuggerAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/FocusDebuggerAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/FocusTracesAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/FocusTracesAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/FocusTracesDialog.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/FocusTracesDialog.java
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/LogFocusRequestsAction.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/LogFocusRequestsAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/LogFocusRequestsAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/LogFocusRequestsAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/Util.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/Util.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/Util.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/Util.java
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/focus/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/focus/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/focus/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/internal/jcef/CookieManagerDialog.java b/platform/platform-impl/internal/src/com/intellij/internal/jcef/CookieManagerDialog.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/jcef/CookieManagerDialog.java
rename to platform/platform-impl/internal/src/com/intellij/internal/jcef/CookieManagerDialog.java
diff --git a/platform/platform-impl/src/com/intellij/internal/jcef/JBCefBrowserDemo.java b/platform/platform-impl/internal/src/com/intellij/internal/jcef/JBCefBrowserDemo.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/jcef/JBCefBrowserDemo.java
rename to platform/platform-impl/internal/src/com/intellij/internal/jcef/JBCefBrowserDemo.java
diff --git a/platform/platform-impl/src/com/intellij/internal/jcef/JBCefOsrBrowserMeasureFpsAction.java b/platform/platform-impl/internal/src/com/intellij/internal/jcef/JBCefOsrBrowserMeasureFpsAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/jcef/JBCefOsrBrowserMeasureFpsAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/jcef/JBCefOsrBrowserMeasureFpsAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/DecisionFunction.java b/platform/platform-impl/internal/src/com/intellij/internal/ml/DecisionFunction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/DecisionFunction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/DecisionFunction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/FeatureMapper.java b/platform/platform-impl/internal/src/com/intellij/internal/ml/FeatureMapper.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/FeatureMapper.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/FeatureMapper.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/Features.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/Features.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/Features.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/Features.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/FeaturesInfo.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/FeaturesInfo.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/FeaturesInfo.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/FeaturesInfo.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/InconsistentMetadataException.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/InconsistentMetadataException.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/InconsistentMetadataException.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/InconsistentMetadataException.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/ModelMetadata.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/ModelMetadata.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/ModelMetadata.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/ModelMetadata.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/ModelMetadataReader.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/ModelMetadataReader.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/ModelMetadataReader.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/ModelMetadataReader.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/ResourcesModelMetadataReader.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/ResourcesModelMetadataReader.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/ResourcesModelMetadataReader.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/ResourcesModelMetadataReader.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/WordsSplitter.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/WordsSplitter.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/WordsSplitter.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/WordsSplitter.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/catboost/CatBoostJarCompletionModelProvider.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/CatBoostJarCompletionModelProvider.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/catboost/CatBoostJarCompletionModelProvider.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/CatBoostJarCompletionModelProvider.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/catboost/CatBoostResourcesModelMetadataReader.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/CatBoostResourcesModelMetadataReader.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/catboost/CatBoostResourcesModelMetadataReader.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/CatBoostResourcesModelMetadataReader.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/catboost/NaiveCatBoostModel.java b/platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/NaiveCatBoostModel.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/catboost/NaiveCatBoostModel.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/catboost/NaiveCatBoostModel.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/completion/CompletionRankingModelBase.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/completion/CompletionRankingModelBase.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/completion/CompletionRankingModelBase.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/completion/CompletionRankingModelBase.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/completion/DecoratingItemsPolicy.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/completion/DecoratingItemsPolicy.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/completion/DecoratingItemsPolicy.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/completion/DecoratingItemsPolicy.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/completion/JarCompletionModelProvider.kt b/platform/platform-impl/internal/src/com/intellij/internal/ml/completion/JarCompletionModelProvider.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/completion/JarCompletionModelProvider.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/completion/JarCompletionModelProvider.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ml/completion/RankingModelProvider.java b/platform/platform-impl/internal/src/com/intellij/internal/ml/completion/RankingModelProvider.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ml/completion/RankingModelProvider.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ml/completion/RankingModelProvider.java
diff --git a/platform/platform-impl/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java b/platform/platform-impl/internal/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/performance/Latenciometer.kt b/platform/platform-impl/internal/src/com/intellij/internal/performance/Latenciometer.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/performance/Latenciometer.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/performance/Latenciometer.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/BasePreferences.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/BasePreferences.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/BasePreferences.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/BasePreferences.java
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/ComponentBounds.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/ComponentBounds.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/ComponentBounds.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/ComponentBounds.java
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/ComponentBoundsFinder.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/ComponentBoundsFinder.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/ComponentBoundsFinder.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/ComponentBoundsFinder.java
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/RulerGuideAction.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/RulerGuideAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/RulerGuideAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/RulerGuideAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/RulerGuidePainter.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/RulerGuidePainter.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/RulerGuidePainter.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/RulerGuidePainter.java
diff --git a/platform/platform-impl/src/com/intellij/internal/rulerguide/SneakyGraphics2D.java b/platform/platform-impl/internal/src/com/intellij/internal/rulerguide/SneakyGraphics2D.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/rulerguide/SneakyGraphics2D.java
rename to platform/platform-impl/internal/src/com/intellij/internal/rulerguide/SneakyGraphics2D.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/EventLogApplicationLifecycleListener.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/EventLogApplicationLifecycleListener.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/EventLogApplicationLifecycleListener.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/EventLogApplicationLifecycleListener.java
diff --git a/platform/platform-impl/src/com/intellij/ide/StatisticsRegionUrlMapperServiceImpl.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/StatisticsRegionUrlMapperServiceImpl.kt
similarity index 91%
rename from platform/platform-impl/src/com/intellij/ide/StatisticsRegionUrlMapperServiceImpl.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/StatisticsRegionUrlMapperServiceImpl.kt
index cb9c82d9ff68..39bbd895181d 100644
--- a/platform/platform-impl/src/com/intellij/ide/StatisticsRegionUrlMapperServiceImpl.kt
+++ b/platform/platform-impl/internal/src/com/intellij/internal/statistic/StatisticsRegionUrlMapperServiceImpl.kt
@@ -1,7 +1,8 @@
 // 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.ide
+package com.intellij.internal.statistic
 
 import com.intellij.ide.RegionSettings.RegionSettingsListener
+import com.intellij.ide.RegionUrlMapper
 import com.intellij.internal.statistic.eventLog.EventLogInternalApplicationInfo
 import com.intellij.internal.statistic.eventLog.StatisticsRegionUrlMapperService
 import com.intellij.openapi.components.serviceIfCreated
@@ -12,12 +13,12 @@ import kotlin.time.Duration.Companion.minutes
 /**
  * Service implementation to access [com.intellij.ide.RegionUrlMapper] from code in *intellij.platform.statistics* module without introducing dependency
  *
- * If changed, please, update [com.intellij.internal.statistic.eventLog.StatisticsRegionUrlMapperService.Companion.getInstance]
+ * If changed, please, update [StatisticsRegionUrlMapperService.Companion.getInstance]
  */
 @ApiStatus.Internal
 private class StatisticsRegionUrlMapperServiceImpl(val scope: CoroutineScope) : StatisticsRegionUrlMapperService() {
   @Volatile
-  var url: String? = null
+  private var url: String? = null
 
   /**
    * To respect @RequiresBackgroundThread @RequiresReadLockAbsence annotations in [com.intellij.ide.RegionUrlMapper] and simplify usages of
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/FacetTypeUsageCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/FacetTypeUsageCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/FacetTypeUsageCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/FacetTypeUsageCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/KeymapChangesCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/KeymapChangesCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/KeymapChangesCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/KeymapChangesCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/KeymapUsageCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/KeymapUsageCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/KeymapUsageCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/KeymapUsageCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/LocalizationUsageCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/LocalizationUsageCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/LocalizationUsageCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/LocalizationUsageCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/RegistryApplicationUsagesCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/RegistryApplicationUsagesCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/RegistryApplicationUsagesCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/RegistryApplicationUsagesCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ToolkitInfoCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ToolkitInfoCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ToolkitInfoCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ToolkitInfoCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/TypingEventsLogger.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/UpdateManagerUsagesCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/UpdateManagerUsagesCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/UpdateManagerUsagesCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/UpdateManagerUsagesCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/build/BazelFilesTypeUsageSchemaDescriptor.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/build/BazelFilesTypeUsageSchemaDescriptor.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/build/BazelFilesTypeUsageSchemaDescriptor.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/build/BazelFilesTypeUsageSchemaDescriptor.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/build/BuildToolsCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/build/BuildToolsCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/build/BuildToolsCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/build/BuildToolsCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageServiceFileEditorManagerListener.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageServiceFileEditorManagerListener.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageServiceFileEditorManagerListener.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageServiceFileEditorManagerListener.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsagesCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsagesCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsagesCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsagesCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/ProjectStructureUsageCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/ProjectStructureUsageCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/ProjectStructureUsageCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/fileTypes/ProjectStructureUsageCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/os/LinuxWindowManagerUsageCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/os/LinuxWindowManagerUsageCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/os/LinuxWindowManagerUsageCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/os/LinuxWindowManagerUsageCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/os/SystemRuntimeCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/os/SystemRuntimeCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/os/SystemRuntimeCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/os/SystemRuntimeCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/plugins/PluginsUsagesCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/plugins/PluginsUsagesCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/plugins/PluginsUsagesCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/plugins/PluginsUsagesCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/project/IndexableFilesCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/project/IndexableFilesCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/project/IndexableFilesCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/project/IndexableFilesCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/project/IntelliJProjectUsageCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/project/IntelliJProjectUsageCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/project/IntelliJProjectUsageCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/project/IntelliJProjectUsageCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/settings/ProxySettingsCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/settings/ProxySettingsCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/settings/ProxySettingsCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/settings/ProxySettingsCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/EditorColorSchemesUsagesCollector.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/EditorColorSchemesUsagesCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/EditorColorSchemesUsagesCollector.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/EditorColorSchemesUsagesCollector.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/FontSizeInfoUsageCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/FontSizeInfoUsageCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/FontSizeInfoUsageCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/FontSizeInfoUsageCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/UiInfoUsageCollector.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/UiInfoUsageCollector.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/UiInfoUsageCollector.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/UiInfoUsageCollector.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/collectors/fus/ui/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/fileTypes/FileTypeStatisticProvider.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/fileTypes/FileTypeStatisticProvider.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/fileTypes/FileTypeStatisticProvider.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/fileTypes/FileTypeStatisticProvider.java
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/fileTypes/UpdateComponentWatcher.kt b/platform/platform-impl/internal/src/com/intellij/internal/statistic/fileTypes/UpdateComponentWatcher.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/fileTypes/UpdateComponentWatcher.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/fileTypes/UpdateComponentWatcher.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/notification/StatisticsNotificationManagerImpl.java b/platform/platform-impl/internal/src/com/intellij/internal/statistic/notification/StatisticsNotificationManagerImpl.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/statistic/notification/StatisticsNotificationManagerImpl.java
rename to platform/platform-impl/internal/src/com/intellij/internal/statistic/notification/StatisticsNotificationManagerImpl.java
diff --git a/platform/platform-impl/src/com/intellij/internal/tree/ExpandAll.java b/platform/platform-impl/internal/src/com/intellij/internal/tree/ExpandAll.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/tree/ExpandAll.java
rename to platform/platform-impl/internal/src/com/intellij/internal/tree/ExpandAll.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/AnimationPanelTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/AnimationPanelTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/AnimationPanelTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/AnimationPanelTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/AnimatorTestAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/AnimatorTestAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/AnimatorTestAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/AnimatorTestAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ComponentPanelTestAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/ComponentPanelTestAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ComponentPanelTestAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ComponentPanelTestAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/InlineBannerTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/InlineBannerTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/InlineBannerTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/InlineBannerTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/JEditorPaneDemoAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/JEditorPaneDemoAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/JEditorPaneDemoAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/JEditorPaneDemoAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/PositionTrackerTestAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/PositionTrackerTestAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/PositionTrackerTestAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/PositionTrackerTestAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ProgressIconShowcaseAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/ProgressIconShowcaseAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ProgressIconShowcaseAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ProgressIconShowcaseAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/RoundedIconTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/RoundedIconTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/RoundedIconTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/RoundedIconTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ShowGotItDemoAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/ShowGotItDemoAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ShowGotItDemoAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ShowGotItDemoAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ShowIconScaleTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/ShowIconScaleTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ShowIconScaleTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ShowIconScaleTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ShowIconsNotPatchedForExpUi.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/ShowIconsNotPatchedForExpUi.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ShowIconsNotPatchedForExpUi.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ShowIconsNotPatchedForExpUi.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/ShowMainMenuAction.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/ShowMainMenuAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/ShowMainMenuAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/ShowMainMenuAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/WrapLayoutTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/WrapLayoutTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/WrapLayoutTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/WrapLayoutTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/X11UiTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/X11UiTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/X11UiTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/X11UiTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/GridLayoutTestAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/GridLayoutTestAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/GridLayoutTestAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/GridLayoutTestAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/SizeGroupPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/SizeGroupPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/SizeGroupPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/SizeGroupPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/gridLayoutTestAction/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/gridLayoutTestAction/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxDialog.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxDialog.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxDialog.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxDialog.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxUtils.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxUtils.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/UISandboxUtils.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/UISandboxUtils.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBIntSpinnerPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBIntSpinnerPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBIntSpinnerPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBIntSpinnerPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBOptionButtonPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBOptionButtonPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBOptionButtonPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBOptionButtonPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBTabsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBTabsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBTabsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBTabsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBTextAreaPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBTextAreaPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JBTextAreaPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JBTextAreaPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JButtonPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JButtonPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JButtonPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JButtonPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JCheckBoxPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JCheckBoxPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JCheckBoxPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JCheckBoxPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JComboBoxPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JComboBoxPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JComboBoxPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JComboBoxPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JRadioButtonPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JRadioButtonPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JRadioButtonPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JRadioButtonPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JSpinnerPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JSpinnerPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JSpinnerPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JSpinnerPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JTextFieldPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JTextFieldPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/JTextFieldPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/JTextFieldPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/SearchTextFieldPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/SearchTextFieldPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/SearchTextFieldPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/SearchTextFieldPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/ThreeStateCheckBoxPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/ThreeStateCheckBoxPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/components/ThreeStateCheckBoxPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/components/ThreeStateCheckBoxPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CellsWithSubPanelsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CellsWithSubPanelsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CellsWithSubPanelsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CellsWithSubPanelsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CheckBoxRadioButtonPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CheckBoxRadioButtonPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CheckBoxRadioButtonPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CheckBoxRadioButtonPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CommentsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CommentsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/CommentsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/CommentsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/DeprecatedApiPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/DeprecatedApiPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/DeprecatedApiPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/DeprecatedApiPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/GroupsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/GroupsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/GroupsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/GroupsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/LabelsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/LabelsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/LabelsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/LabelsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/LongTextsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/LongTextsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/LongTextsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/LongTextsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/OnChangePanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/OnChangePanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/OnChangePanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/OnChangePanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/OthersPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/OthersPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/OthersPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/OthersPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/PlaceholderPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/PlaceholderPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/PlaceholderPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/PlaceholderPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/ResizableRowsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/ResizableRowsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/ResizableRowsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/ResizableRowsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/SegmentedButtonPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/SegmentedButtonPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/SegmentedButtonPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/SegmentedButtonPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/TextFieldsPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextMaxLinePanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/TextMaxLinePanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/TextMaxLinePanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/TextMaxLinePanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/VisibleEnabledPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/VisibleEnabledPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/VisibleEnabledPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/VisibleEnabledPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrComboBoxPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrComboBoxPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrComboBoxPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrComboBoxPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrListPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrListPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrListPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrListPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrOthersPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrOthersPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrOthersPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrOthersPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrSeparatorPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrSeparatorPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrSeparatorPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/listCellRenderer/LcrSeparatorPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/CrossValidationPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/CrossValidationPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/CrossValidationPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/CrossValidationPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationRefactoringPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationRefactoringPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationRefactoringPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/dsl/validation/ValidationRefactoringPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/tests/accessibility/AccessibilityFailedInspections.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/tests/accessibility/AccessibilityFailedInspections.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/tests/accessibility/AccessibilityFailedInspections.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/tests/accessibility/AccessibilityFailedInspections.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/sandbox/tests/components/JBTextAreaTestPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/tests/components/JBTextAreaTestPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/sandbox/tests/components/JBTextAreaTestPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/sandbox/tests/components/JBTextAreaTestPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/Demo.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/Demo.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/Demo.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/Demo.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoAvailability.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoAvailability.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoAvailability.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoAvailability.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoBasics.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoBasics.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoBasics.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoBasics.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoBinding.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoBinding.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoBinding.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoBinding.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComments.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComments.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComments.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComments.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComponentLabels.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComponentLabels.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComponentLabels.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComponentLabels.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComponents.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComponents.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoComponents.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoComponents.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoGaps.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoGaps.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoGaps.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoGaps.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoGroups.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoGroups.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoGroups.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoGroups.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoRowLayout.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoRowLayout.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoRowLayout.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoRowLayout.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoTips.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoTips.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoTips.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoTips.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoValidation.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoValidation.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoValidation.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/DemoValidation.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/UiDslShowcaseAction.kt b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/UiDslShowcaseAction.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/UiDslShowcaseAction.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/UiDslShowcaseAction.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/ui/uiDslShowcase/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/MyPanel.kt b/platform/platform-impl/internal/src/com/intellij/internal/validation/MyPanel.kt
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/MyPanel.kt
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/MyPanel.kt
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/TestDialogWithValidationAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/TestDialogWithValidationAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/TestDialogWithValidationAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/TestDnd.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/TestDnd.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/TestMacMessagesAction.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/TestMacMessagesAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/TestMacMessagesAction.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/TestMacMessagesAction.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/ValidTest.form b/platform/platform-impl/internal/src/com/intellij/internal/validation/ValidTest.form
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/ValidTest.form
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/ValidTest.form
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/ValidTest.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/ValidTest.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/ValidTest.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/ValidTest.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/ValidationTest.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/ValidationTest.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/ValidationTest.java
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/package-info.java b/platform/platform-impl/internal/src/com/intellij/internal/validation/package-info.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/internal/validation/package-info.java
rename to platform/platform-impl/internal/src/com/intellij/internal/validation/package-info.java
diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.kt b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.kt
index 5f1fb0654157..2225009775d1 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.kt
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.kt
@@ -1175,7 +1175,7 @@ private object SequencedEventNestedFieldHolder {
  * and after [processAppActivationEvent], which defeats the very purpose of this flag.
  */
 @Internal
-internal var skipWindowDeactivationEvents: Boolean = false
+var skipWindowDeactivationEvents: Boolean = false
 
 // we have to stop editing with <ESC> (if any) and consume the event to prevent any further processing (dialog closing etc.)
 private class EditingCanceller : IdeEventQueue.EventDispatcher {
diff --git a/platform/platform-impl/src/com/intellij/ide/settings/json/SettingsInspector.kt b/platform/platform-impl/src/com/intellij/ide/settings/json/SettingsInspector.kt
index 51feca439e90..5e3ce690d32a 100644
--- a/platform/platform-impl/src/com/intellij/ide/settings/json/SettingsInspector.kt
+++ b/platform/platform-impl/src/com/intellij/ide/settings/json/SettingsInspector.kt
@@ -29,7 +29,8 @@ fun buildComponentModel(): JsonSettingsModel.ComponentModel =
   })
 
 
-internal fun listAppComponents(): List<ComponentDescriptor> {
+@ApiStatus.Internal
+fun listAppComponents(): List<ComponentDescriptor> {
   val descriptors = mutableListOf<ComponentDescriptor>()
   fun processImplementationClass(aClass: Class<*>, descriptor: PluginDescriptor?) {
     if (PersistentStateComponent::class.java.isAssignableFrom(aClass)) {
@@ -64,7 +65,8 @@ private fun getState(aClass: Class<*>): State? {
 }
 
 
-internal data class ComponentDescriptor(
+@ApiStatus.Internal
+data class ComponentDescriptor(
   val name: String,
   val aClass: Class<PersistentStateComponent<*>>,
   val pluginDescriptor: PluginDescriptor?,
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/migrations/PluginMigration.kt b/platform/platform-impl/src/com/intellij/openapi/application/migrations/PluginMigration.kt
index ecb319401fc0..d7e2c33d7d22 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/migrations/PluginMigration.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/application/migrations/PluginMigration.kt
@@ -6,7 +6,7 @@ import com.intellij.ide.plugins.PluginNode
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.application.PluginMigrationOptions
 import com.intellij.openapi.extensions.PluginId
-import org.jetbrains.annotations.ApiStatus.Internal
+import org.jetbrains.annotations.ApiStatus
 import java.nio.file.Files
 
 internal abstract class PluginMigration {
@@ -40,7 +40,8 @@ internal abstract class PluginMigration {
 
 internal const val MIGRATION_INSTALLED_PLUGINS_TXT = "migration_installed_plugins.txt"
 
-internal fun getMigrationInstalledPluginIds(): Collection<PluginId> {
+@ApiStatus.Internal
+fun getMigrationInstalledPluginIds(): Collection<PluginId> {
   val migratedPluginsPath = PathManager.getConfigDir().resolve(MIGRATION_INSTALLED_PLUGINS_TXT)
   if (Files.exists(migratedPluginsPath)) {
     val lines = Files.readAllLines(migratedPluginsPath)
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowButtonsConfiguration.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowButtonsConfiguration.kt
index 2434281e4438..73b370ab02c4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowButtonsConfiguration.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowButtonsConfiguration.kt
@@ -1,6 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 @file:ApiStatus.Internal
-
 package com.intellij.openapi.wm.impl
 
 import com.intellij.diagnostic.LoadingState
@@ -18,8 +17,7 @@ import org.jetbrains.annotations.ApiStatus
  * Cache state for quick application start-up
  */
 @State(name = "WindowButtonsConfiguration", storages = [Storage(StoragePathMacros.CACHE_FILE)])
-internal class WindowButtonsConfiguration(private val scope: CoroutineScope) : PersistentStateComponent<WindowButtonsConfiguration.State?> {
-
+class WindowButtonsConfiguration(private val scope: CoroutineScope) : PersistentStateComponent<WindowButtonsConfiguration.State?> {
   enum class WindowButton {
     MINIMIZE,
     MAXIMIZE,
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt
index 0cae37cc3ea5..86c5305553b8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt
@@ -50,6 +50,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.withContext
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.ApiStatus.Internal
 import java.awt.*
 import java.awt.event.MouseEvent
@@ -321,7 +322,8 @@ private fun createActionBar(group: ActionGroup, customizationGroup: ActionGroup?
  * Method is added for Demo-action only
  * Do not use it in your code
  */
-internal fun createDemoToolbar(group: ActionGroup): MyActionToolbarImpl = createActionBar(group, null)
+@Internal
+fun createDemoToolbar(group: ActionGroup): MyActionToolbarImpl = createActionBar(group, null)
 
 private fun addWidget(widget: JComponent, parent: JComponent, position: HorizontalLayout.Group) {
   parent.add(widget, position)
@@ -330,7 +332,8 @@ private fun addWidget(widget: JComponent, parent: JComponent, position: Horizont
   }
 }
 
-internal class MyActionToolbarImpl(group: ActionGroup, customizationGroup: ActionGroup?)
+@ApiStatus.Internal
+class MyActionToolbarImpl(group: ActionGroup, customizationGroup: ActionGroup?)
   : ActionToolbarImpl(ActionPlaces.MAIN_TOOLBAR, group, true, false, false) {
   private val iconUpdater = HeaderIconUpdater()
 
diff --git a/platform/platform-impl/src/com/intellij/ui/GotItTooltip.kt b/platform/platform-impl/src/com/intellij/ui/GotItTooltip.kt
index bb03a3df44f8..bd2bb396f066 100644
--- a/platform/platform-impl/src/com/intellij/ui/GotItTooltip.kt
+++ b/platform/platform-impl/src/com/intellij/ui/GotItTooltip.kt
@@ -70,9 +70,9 @@ class GotItTooltipService {
  * The description of the tooltip can contain inline shortcuts, icons and links.
  * See [GotItTextBuilder] doc for more info.
  */
-class GotItTooltip internal constructor(@NonNls val id: String,
-                                        private val gotItBuilder: GotItComponentBuilder,
-                                        parentDisposable: Disposable? = null) : ToolbarActionTracker<Balloon>() {
+class GotItTooltip @ApiStatus.Internal constructor(@NonNls val id: String,
+                                                   private val gotItBuilder: GotItComponentBuilder,
+                                                   parentDisposable: Disposable? = null) : ToolbarActionTracker<Balloon>() {
   private var timeout: Int = -1
   private var maxCount = 1
   private var onBalloonCreated: (Balloon) -> Unit = {}
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index d4a7a815cd27..d776e1854858 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -888,7 +888,7 @@
     <config.inlaySettingsProvider implementation="com.intellij.codeInsight.hints.settings.providers.NewInlaySettingsProvider"/>
 
     <applicationService serviceInterface="com.intellij.internal.statistic.eventLog.StatisticsRegionUrlMapperService"
-                        serviceImplementation="com.intellij.ide.StatisticsRegionUrlMapperServiceImpl" preload="notLightEdit"/>
+                        serviceImplementation="com.intellij.internal.statistic.StatisticsRegionUrlMapperServiceImpl" preload="notLightEdit"/>
     <statistics.validation.customValidationRule
       implementation="com.intellij.configurationStore.statistic.eventLog.SettingsComponentNameValidator"/>
     <statistics.validation.customValidationRuleFactory implementation="com.intellij.configurationStore.statistic.eventLog.SettingsValueValidatorFactory"/>
@@ -1920,7 +1920,7 @@
               os="windows"/>
 
     <listener topic="com.intellij.ide.RegionSettings$RegionSettingsListener"
-              class="com.intellij.ide.StatisticsRegionSettingsListener"/>
+              class="com.intellij.internal.statistic.StatisticsRegionSettingsListener"/>
   </applicationListeners>
 
   <projectListeners>
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 0dfa026ec902..544662f74d63 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -95,6 +95,7 @@
     <orderEntry type="library" name="jsvg" level="project" />
     <orderEntry type="library" scope="TEST" name="hash4j" level="project" />
     <orderEntry type="module" module-name="intellij.java.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.io.storages" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
     <orderEntry type="library" scope="TEST" name="ktor-server-cio" level="project" />
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index d5c0c605686e..2962438d1ebe 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -55,6 +55,7 @@
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="module" module-name="intellij.platform.kernel" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
     <orderEntry type="module" module-name="intellij.platform.project" />
diff --git a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.iml b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.iml
index adcd6ebdf1ff..7fc458fcf3ff 100644
--- a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.iml
+++ b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.completionMlRanking" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module-library">
       <library name="completion-ranking-java-exp" type="repository">
         <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-ranking-java:0.8.2">
diff --git a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml
index 8e27ad3ccba8..101988f29664 100644
--- a/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml
+++ b/plugins/completion-ml-ranking-models/intellij.completionMlRankingModels.tests.iml
@@ -11,5 +11,6 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.completionMlRankingModels" scope="TEST" />
     <orderEntry type="module" module-name="intellij.completionMlRanking" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
index 067fb52761e2..f0be52fd1e73 100644
--- a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
+++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
@@ -47,6 +47,7 @@
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml
index 7e723130c3f3..82aeedebe7d5 100644
--- a/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml
+++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.ml.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="ngram-slp" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ml" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/filePrediction/intellij.filePrediction.iml b/plugins/filePrediction/intellij.filePrediction.iml
index 51675bd5adc7..da84c6e7732f 100644
--- a/plugins/filePrediction/intellij.filePrediction.iml
+++ b/plugins/filePrediction/intellij.filePrediction.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
     <orderEntry type="module" module-name="intellij.vcs.git" />
     <orderEntry type="module" module-name="intellij.platform.uast" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
diff --git a/plugins/kotlin/ml-completion/kotlin.ml-completion.iml b/plugins/kotlin/ml-completion/kotlin.ml-completion.iml
index 3133815e473d..4e7e75410275 100644
--- a/plugins/kotlin/ml-completion/kotlin.ml-completion.iml
+++ b/plugins/kotlin/ml-completion/kotlin.ml-completion.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.completionMlRanking" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module-library">
       <library name="completion-ranking-kotlin" type="repository">
         <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.completion:completion-ranking-kotlin:0.4.0">
diff --git a/plugins/kotlin/ml-completion/tests/kotlin.ml-completion.tests.iml b/plugins/kotlin/ml-completion/tests/kotlin.ml-completion.tests.iml
index 363af59bea69..54b9a2834f57 100644
--- a/plugins/kotlin/ml-completion/tests/kotlin.ml-completion.tests.iml
+++ b/plugins/kotlin/ml-completion/tests/kotlin.ml-completion.tests.iml
@@ -11,6 +11,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="kotlin.ml-completion" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/marketplace-ml/intellij.marketplaceMl.iml b/plugins/marketplace-ml/intellij.marketplaceMl.iml
index f2eaff0dc070..0f43939d21cf 100644
--- a/plugins/marketplace-ml/intellij.marketplaceMl.iml
+++ b/plugins/marketplace-ml/intellij.marketplaceMl.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ml.impl" />
   </component>
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
index 0e8b4d76b780..00baa0aefaa1 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module-library">
       <library name="github.oshi.core" type="repository">
         <properties maven-id="com.github.oshi:oshi-core:6.6.0">
diff --git a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
index e2f8ac0821a1..f9a8a35aa6e9 100644
--- a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
+++ b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ml.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.json" />
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 8e9c6f2424b8..d958404e7e65 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -93,6 +93,7 @@
     <orderEntry type="library" name="kotlinx-datetime-jvm" level="project" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="library" scope="PROVIDED" name="opentelemetry" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="opentelemetry-semconv" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="opentelemetry-extension-kotlin" level="project" />
diff --git a/plugins/turboComplete/intellij.turboComplete.iml b/plugins/turboComplete/intellij.turboComplete.iml
index 8563ee550ed0..767c6bbcb1f5 100644
--- a/plugins/turboComplete/intellij.turboComplete.iml
+++ b/plugins/turboComplete/intellij.turboComplete.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.completionMlRanking" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ml.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.ml" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/turboComplete/languages/kotlin/intellij.turboComplete.languages.kotlin.iml b/plugins/turboComplete/languages/kotlin/intellij.turboComplete.languages.kotlin.iml
index 8adb16d06033..264d6e994cb5 100644
--- a/plugins/turboComplete/languages/kotlin/intellij.turboComplete.languages.kotlin.iml
+++ b/plugins/turboComplete/languages/kotlin/intellij.turboComplete.languages.kotlin.iml
@@ -30,6 +30,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.turboComplete" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index e19d0622a85b..345af0303cb8 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="library" name="gson" level="project" />
diff --git a/python/testSrc/intellij.python.community.tests.iml b/python/testSrc/intellij.python.community.tests.iml
index 92de0f5935ec..590cdf20cae8 100644
--- a/python/testSrc/intellij.python.community.tests.iml
+++ b/python/testSrc/intellij.python.community.tests.iml
@@ -21,6 +21,7 @@
     <orderEntry type="library" scope="TEST" name="easymock" level="project" />
     <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />