diff --git a/java/debugger/impl/test/com/intellij/debugger/artifacts/TestDebuggerAgentArtifactsProviderImpl.java b/java/debugger/impl/test/com/intellij/debugger/artifacts/TestDebuggerAgentArtifactsProviderImpl.java
index 300edb63df05..d3d759831587 100644
--- a/java/debugger/impl/test/com/intellij/debugger/artifacts/TestDebuggerAgentArtifactsProviderImpl.java
+++ b/java/debugger/impl/test/com/intellij/debugger/artifacts/TestDebuggerAgentArtifactsProviderImpl.java
@@ -2,7 +2,7 @@
 package com.intellij.debugger.artifacts;
 
 import com.intellij.debugger.testFramework.TestDebuggerAgentArtifactsProvider;
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel;
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel;
 import com.intellij.testFramework.common.BazelTestUtil;
 
 import java.nio.file.Path;
diff --git a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelLabel.kt b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelLabel.kt
index e8ebe86a64f3..1b085752f405 100644
--- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelLabel.kt
+++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelLabel.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
+package org.jetbrains.intellij.bazelEnvironment
 
 import org.jetbrains.annotations.ApiStatus
 
diff --git a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfiles.kt b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfiles.kt
index 466cc7a5bd17..d1e47461fe86 100644
--- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfiles.kt
+++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfiles.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
+package org.jetbrains.intellij.bazelEnvironment
 
 import java.nio.file.Path
 import kotlin.io.path.absolute
diff --git a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfilesManifest.kt b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfilesManifest.kt
index 02627857ab0d..9d7f1f7990d0 100644
--- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfilesManifest.kt
+++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/bazelEnvironment/BazelRunfilesManifest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
+package org.jetbrains.intellij.bazelEnvironment
 
 import java.nio.file.Path
 import kotlin.io.path.exists
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BazelModuleOutputProvider.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BazelModuleOutputProvider.kt
index 90c80428db4e..78f9406c0d56 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BazelModuleOutputProvider.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BazelModuleOutputProvider.kt
@@ -8,8 +8,8 @@ import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.intellij.build.ModuleOutputProvider
 import org.jetbrains.intellij.build.io.ZipEntryProcessorResult
 import org.jetbrains.intellij.build.io.readZipFile
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
 import org.jetbrains.jps.model.module.JpsModule
 import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
 import java.nio.file.Files
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt
index 87c8546d239c..83ec36becda3 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import org.jetbrains.intellij.build.BuildOptions
 import org.jetbrains.intellij.build.CompilationContext
 import org.jetbrains.intellij.build.impl.logging.jps.withJpsLogging
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
+import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
 import org.jetbrains.intellij.build.telemetry.TraceManager
 import org.jetbrains.intellij.build.telemetry.TraceManager.spanBuilder
 import org.jetbrains.intellij.build.telemetry.use
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt
index 56365e24e03b..f095bf9eca58 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt
@@ -6,7 +6,7 @@ import kotlinx.collections.immutable.persistentListOf
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
 import org.jetbrains.intellij.build.impl.addToClasspathAgent.AddToClasspathUtil
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
+import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
 import java.nio.file.Files
 import java.nio.file.Path
 
diff --git a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/bazelEnvironment/BazelLabelTest.kt b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/bazelEnvironment/BazelLabelTest.kt
index c6399088a3e5..7a708fb91fac 100644
--- a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/bazelEnvironment/BazelLabelTest.kt
+++ b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/bazelEnvironment/BazelLabelTest.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.intellij.bazelEnvironment
 
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
 import org.junit.Test
 import org.junit.jupiter.api.Assertions
 
diff --git a/platform/testFramework/common/src/common/BazelTestUtil.kt b/platform/testFramework/common/src/common/BazelTestUtil.kt
index 7edead196d63..5e77c8569fef 100644
--- a/platform/testFramework/common/src/common/BazelTestUtil.kt
+++ b/platform/testFramework/common/src/common/BazelTestUtil.kt
@@ -2,8 +2,8 @@
 package com.intellij.testFramework.common
 
 import org.jetbrains.annotations.ApiStatus
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
 import java.nio.file.Path
 import kotlin.io.path.*
 
diff --git a/platform/testFramework/common/src/common/bazel/BazelLabelArchiveProjectInfo.kt b/platform/testFramework/common/src/common/bazel/BazelLabelArchiveProjectInfo.kt
index 28867f5f4cea..803c325c06f4 100644
--- a/platform/testFramework/common/src/common/bazel/BazelLabelArchiveProjectInfo.kt
+++ b/platform/testFramework/common/src/common/bazel/BazelLabelArchiveProjectInfo.kt
@@ -6,7 +6,7 @@ import com.intellij.testFramework.common.BazelTestUtil
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader.extractFileToCacheLocation
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesUtil.extractZip
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
 import java.nio.file.Path
 
 data class BazelLabelArchiveProjectInfo(
diff --git a/platform/testFramework/common/src/common/bazel/BazelTestDependencyHttpFileDownloader.kt b/platform/testFramework/common/src/common/bazel/BazelTestDependencyHttpFileDownloader.kt
index e1d50934f555..9c36688b4d11 100644
--- a/platform/testFramework/common/src/common/bazel/BazelTestDependencyHttpFileDownloader.kt
+++ b/platform/testFramework/common/src/common/bazel/BazelTestDependencyHttpFileDownloader.kt
@@ -8,7 +8,7 @@ import com.intellij.testFramework.common.BazelTestUtil.getFileFromBazelRuntime
 import com.intellij.util.io.DigestUtil
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
 import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
 import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/TestKotlinArtifacts.kt b/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/TestKotlinArtifacts.kt
index 774adef84040..570e5bb09107 100644
--- a/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/TestKotlinArtifacts.kt
+++ b/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/TestKotlinArtifacts.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.testFramework.common.BazelTestUtil
 import com.intellij.testFramework.common.BazelTestUtil.getFileFromBazelRuntime
-import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
+import org.jetbrains.intellij.bazelEnvironment.BazelLabel
 import com.intellij.util.io.DigestUtil
 import com.intellij.util.io.createParentDirectories
 import kotlinx.coroutines.Dispatchers