diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/Gaps.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/Gaps.kt
similarity index 94%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/Gaps.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/Gaps.kt
index 30cd87e86b36..ae292a6dc6ea 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/Gaps.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/Gaps.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import org.jetbrains.annotations.ApiStatus
 
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBConstraints.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/JBConstraints.kt
similarity index 97%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/JBConstraints.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/JBConstraints.kt
index f758173e6a0a..8e90b066d86d 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBConstraints.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/JBConstraints.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import org.jetbrains.annotations.ApiStatus
 
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGrid.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGrid.kt
similarity index 94%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGrid.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/JBGrid.kt
index befc1723d910..51831ee754f6 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGrid.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGrid.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import org.jetbrains.annotations.ApiStatus
 
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridException.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridException.kt
similarity index 97%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridException.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/JBGridException.kt
index b5d94cb5beef..8f7d5530aabd 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridException.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridException.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import org.jetbrains.annotations.ApiStatus
 import java.awt.Component
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridImpl.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridImpl.kt
similarity index 99%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridImpl.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/JBGridImpl.kt
index 09fc31a508e0..dbcf5793824e 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridImpl.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridImpl.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import java.awt.Dimension
 import java.awt.Rectangle
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridLayout.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridLayout.kt
similarity index 98%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridLayout.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/JBGridLayout.kt
index 9559156929b7..b597ae1b5cc7 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/JBGridLayout.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/JBGridLayout.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout
+package com.intellij.ui.gridLayout
 
 import org.jetbrains.annotations.ApiStatus
 import java.awt.*
diff --git a/platform/util/ui/src/com/intellij/util/ui/gridLayout/builders/RowsGridBuilder.kt b/platform/platform-api/src/com/intellij/ui/gridLayout/builders/RowsGridBuilder.kt
similarity index 94%
rename from platform/util/ui/src/com/intellij/util/ui/gridLayout/builders/RowsGridBuilder.kt
rename to platform/platform-api/src/com/intellij/ui/gridLayout/builders/RowsGridBuilder.kt
index 4b7f65900712..e85d32e196c6 100644
--- a/platform/util/ui/src/com/intellij/util/ui/gridLayout/builders/RowsGridBuilder.kt
+++ b/platform/platform-api/src/com/intellij/ui/gridLayout/builders/RowsGridBuilder.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.util.ui.gridLayout.builders
+package com.intellij.ui.gridLayout.builders
 
-import com.intellij.util.ui.gridLayout.*
+import com.intellij.ui.gridLayout.*
 import org.jetbrains.annotations.ApiStatus
 import javax.swing.JComponent
 
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/JBGridLayoutTestAction.kt b/platform/platform-impl/src/com/intellij/internal/ui/JBGridLayoutTestAction.kt
index 6b9a2ead8a21..4f26fefb646d 100644
--- a/platform/platform-impl/src/com/intellij/internal/ui/JBGridLayoutTestAction.kt
+++ b/platform/platform-impl/src/com/intellij/internal/ui/JBGridLayoutTestAction.kt
@@ -6,8 +6,8 @@ import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.components.JBList
 import com.intellij.ui.components.JBTabbedPane
-import com.intellij.util.ui.gridLayout.*
-import com.intellij.util.ui.gridLayout.builders.RowsGridBuilder
+import com.intellij.ui.gridLayout.*
+import com.intellij.ui.gridLayout.builders.RowsGridBuilder
 import java.awt.Color
 import java.awt.Component
 import java.awt.Dimension