diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt
index a7bc0eb6285..b250b6df913 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.incremental
 import org.jetbrains.jps.builders.storage.StorageProvider
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.ScopeKind
+import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner
 import org.jetbrains.kotlin.jps.incremental.storage.LookupMap
 import java.io.File
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt
index 4aa11a21ac0..36cda8b5fc5 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.incremental
+package org.jetbrains.kotlin.jps.incremental.storage
 
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.jps.incremental.storage.StorageOwner
-import org.jetbrains.kotlin.jps.incremental.storage.BasicMap
 
 open class BasicMapsOwner : StorageOwner {
     private val maps = arrayListOf<BasicMap<*, *>>()