diff --git a/platform/platform-impl/src/com/intellij/ui/migLayout.kt b/platform/platform-impl/src/com/intellij/ui/layout.kt
similarity index 84%
rename from platform/platform-impl/src/com/intellij/ui/migLayout.kt
rename to platform/platform-impl/src/com/intellij/ui/layout.kt
index edb52bab4b63..c108701ed227 100644
--- a/platform/platform-impl/src/com/intellij/ui/migLayout.kt
+++ b/platform/platform-impl/src/com/intellij/ui/layout.kt
@@ -16,7 +16,11 @@
 package com.intellij.layout
 
 import com.intellij.BundleBase
+import com.intellij.openapi.vcs.changes.issueLinks.LinkMouseListenerBase
 import com.intellij.ui.IdeBorderFactory
+import com.intellij.ui.JBColor
+import com.intellij.ui.SimpleColoredComponent
+import com.intellij.ui.SimpleTextAttributes
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.ui.UIUtil
 import net.miginfocom.layout.*
@@ -26,6 +30,7 @@ import java.awt.Component
 import java.awt.Font
 import java.awt.LayoutManager
 import java.awt.event.ActionEvent
+import java.util.regex.Pattern
 import javax.swing.*
 
 // http://www.migcalendar.com/miglayout/mavensite/docs/cheatsheet.pdf
@@ -213,4 +218,33 @@ fun CC.apply(flags: Array<out CCFlags>): CC {
     }
   }
   return this
+}
+
+private val HREF_PATTERN = Pattern.compile("<a(?:\\s+href\\s*=\\s*[\"']([^\"']*)[\"'])?\\s*>([^<]*)</a>")
+private val LINK_TEXT_ATTRIBUTES = SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER, JBColor.blue)
+private val SMALL_TEXT_ATTRIBUTES = SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER, null)
+
+fun noteComponent(note: String): SimpleColoredComponent {
+  val noteComponent = SimpleColoredComponent()
+
+  val matcher = HREF_PATTERN.matcher(note)
+  var prev = 0
+  if (matcher.find()) {
+    do {
+      if (matcher.start() != prev) {
+        noteComponent.append(note.substring(prev, matcher.start()), SMALL_TEXT_ATTRIBUTES)
+      }
+      noteComponent.append(matcher.group(2), LINK_TEXT_ATTRIBUTES, SimpleColoredComponent.BrowserLauncherTag(matcher.group(1)))
+      prev = matcher.end()
+    }
+    while (matcher.find())
+
+    LinkMouseListenerBase.installSingleTagOn(noteComponent)
+  }
+
+  if (prev < note.length) {
+    noteComponent.append(note.substring(prev), SMALL_TEXT_ATTRIBUTES)
+  }
+
+  return noteComponent
 }
\ No newline at end of file
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.java
index 2a385f6b3fee..207148f1b66d 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.xdebugger.impl.settings;
 
-import com.intellij.layout.MigLayoutKt;
+import com.intellij.layout.LayoutKt;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtilRt;
 import com.intellij.ui.components.JBLabel;
@@ -84,6 +84,6 @@ public class DataViewsConfigurableUi {
   }
 
   private void createUIComponents() {
-    myEditorSettingsPanel = MigLayoutKt.titledPanel("Editor");
+    myEditorSettingsPanel = LayoutKt.titledPanel("Editor");
   }
 }
\ No newline at end of file
diff --git a/plugins/settings-repository/src/authForm.kt b/plugins/settings-repository/src/authForm.kt
index 63ddce4572be..5d956831fea3 100644
--- a/plugins/settings-repository/src/authForm.kt
+++ b/plugins/settings-repository/src/authForm.kt
@@ -22,24 +22,15 @@ import com.intellij.layout.LCFlags.*
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.ui.dialog
 import com.intellij.openapi.util.Computable
-import com.intellij.openapi.vcs.changes.issueLinks.LinkMouseListenerBase
 import com.intellij.ui.DocumentAdapter
-import com.intellij.ui.JBColor
-import com.intellij.ui.SimpleColoredComponent
-import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.PathUtilRt
 import com.intellij.util.nullize
 import com.intellij.util.trimMiddle
 import com.intellij.util.ui.UIUtil
-import java.util.regex.Pattern
 import javax.swing.JPasswordField
 import javax.swing.JTextField
 import javax.swing.event.DocumentEvent
 
-private val HREF_PATTERN = Pattern.compile("<a(?:\\s+href\\s*=\\s*[\"']([^\"']*)[\"'])?\\s*>([^<]*)</a>")
-private val LINK_TEXT_ATTRIBUTES = SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER, JBColor.blue)
-private val SMALL_TEXT_ATTRIBUTES = SimpleTextAttributes(SimpleTextAttributes.STYLE_SMALLER, null)
-
 fun showAuthenticationForm(credentials: Credentials?, uri: String, host: String?, path: String?, sshKeyFile: String?): Credentials? {
   if (ApplicationManager.getApplication()?.isUnitTestMode === true) {
     throw AssertionError("showAuthenticationForm called from tests")
@@ -96,29 +87,4 @@ fun showAuthenticationForm(credentials: Credentials?, uri: String, host: String?
       null
     }
   })
-}
-
-private fun noteComponent(note: String): SimpleColoredComponent {
-  val noteComponent = SimpleColoredComponent()
-
-  val matcher = HREF_PATTERN.matcher(note)
-  var prev = 0
-  if (matcher.find()) {
-    do {
-      if (matcher.start() != prev) {
-        noteComponent.append(note.substring(prev, matcher.start()), SMALL_TEXT_ATTRIBUTES)
-      }
-      noteComponent.append(matcher.group(2), LINK_TEXT_ATTRIBUTES, SimpleColoredComponent.BrowserLauncherTag(matcher.group(1)))
-      prev = matcher.end()
-    }
-    while (matcher.find())
-
-    LinkMouseListenerBase.installSingleTagOn(noteComponent)
-  }
-
-  if (prev < note.length) {
-    noteComponent.append(note.substring(prev), SMALL_TEXT_ATTRIBUTES)
-  }
-
-  return noteComponent
 }
\ No newline at end of file