diff --git a/plugins/pill/pill-importer/src/artifact/ArtifactElement.kt b/plugins/pill/pill-importer/src/artifact/ArtifactElement.kt
index c6e73ee10e3..d532e30b983 100644
--- a/plugins/pill/pill-importer/src/artifact/ArtifactElement.kt
+++ b/plugins/pill/pill-importer/src/artifact/ArtifactElement.kt
@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlin.pill.artifact
 
-import org.jetbrains.kotlin.pill.PathContext
-import org.jetbrains.kotlin.pill.XmlNode
-import org.jetbrains.kotlin.pill.xml
+import org.jetbrains.kotlin.pill.util.PathContext
+import org.jetbrains.kotlin.pill.util.XmlNode
+import org.jetbrains.kotlin.pill.util.xml
 import java.io.File
 
 sealed class ArtifactElement {
diff --git a/plugins/pill/pill-importer/src/artifact/ArtifactGenerator.kt b/plugins/pill/pill-importer/src/artifact/ArtifactGenerator.kt
index bfb9e506762..d7a4b441863 100644
--- a/plugins/pill/pill-importer/src/artifact/ArtifactGenerator.kt
+++ b/plugins/pill/pill-importer/src/artifact/ArtifactGenerator.kt
@@ -11,6 +11,7 @@ import org.gradle.kotlin.dsl.extra
 import org.jetbrains.kotlin.pill.*
 import org.jetbrains.kotlin.pill.model.PDependency
 import org.jetbrains.kotlin.pill.model.PLibrary
+import org.jetbrains.kotlin.pill.util.ProjectContext
 import java.io.File
 
 class ArtifactGenerator(private val dependencyMapper: ArtifactDependencyMapper) {
diff --git a/plugins/pill/pill-importer/src/artifact/PArtifact.kt b/plugins/pill/pill-importer/src/artifact/PArtifact.kt
index 69e332a9a16..1bb740de337 100644
--- a/plugins/pill/pill-importer/src/artifact/PArtifact.kt
+++ b/plugins/pill/pill-importer/src/artifact/PArtifact.kt
@@ -5,8 +5,9 @@
 
 package org.jetbrains.kotlin.pill.artifact
 
-import org.jetbrains.kotlin.pill.*
 import org.jetbrains.kotlin.pill.artifact.ArtifactElement.*
+import org.jetbrains.kotlin.pill.util.PathContext
+import org.jetbrains.kotlin.pill.util.xml
 import java.io.File
 
 class PArtifact(val artifactName: String, private val outputDir: File, private val contents: Root) {
diff --git a/plugins/pill/pill-importer/src/render.kt b/plugins/pill/pill-importer/src/render.kt
index b9630f117cd..4544b4e258a 100644
--- a/plugins/pill/pill-importer/src/render.kt
+++ b/plugins/pill/pill-importer/src/render.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.pill
 
 import org.jetbrains.kotlin.pill.model.*
+import org.jetbrains.kotlin.pill.util.*
 import java.io.File
 
 class PFile(val path: File, private val text: String) {
diff --git a/plugins/pill/pill-importer/src/PathContext.kt b/plugins/pill/pill-importer/src/util/PathContext.kt
similarity index 98%
rename from plugins/pill/pill-importer/src/PathContext.kt
rename to plugins/pill/pill-importer/src/util/PathContext.kt
index 70b043fe675..20d473f1c2c 100644
--- a/plugins/pill/pill-importer/src/PathContext.kt
+++ b/plugins/pill/pill-importer/src/util/PathContext.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.pill
+package org.jetbrains.kotlin.pill.util
 
 import org.gradle.api.Project
 import org.jetbrains.kotlin.pill.model.PModule
diff --git a/plugins/pill/pill-importer/src/XmlNode.kt b/plugins/pill/pill-importer/src/util/XmlNode.kt
similarity index 97%
rename from plugins/pill/pill-importer/src/XmlNode.kt
rename to plugins/pill/pill-importer/src/util/XmlNode.kt
index cbe3f751df5..aa3e9fc83e6 100644
--- a/plugins/pill/pill-importer/src/XmlNode.kt
+++ b/plugins/pill/pill-importer/src/util/XmlNode.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.pill
+package org.jetbrains.kotlin.pill.util
 
 import shadow.org.jdom2.Document
 import shadow.org.jdom2.Element