diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/PositionalTextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/PositionalTextDiagnostic.kt
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/kotlin/checkers/PositionalTextDiagnostic.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/PositionalTextDiagnostic.kt
index 6b9bff97aca..10fe9c36acb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/PositionalTextDiagnostic.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/PositionalTextDiagnostic.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.checkers
+package org.jetbrains.kotlin.checkers.diagnostics
 
 data class PositionalTextDiagnostic(val diagnostic: CheckerTestUtil.TextDiagnostic, val start: Int, val end: Int)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java
rename to compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
index eb6916add7f..9c6c8e17f2d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt
@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2019 JetBrains s.r.o. 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.checkers;
+package org.jetbrains.kotlin.checkers.utils;
 
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.Maps;
@@ -35,6 +24,8 @@ import kotlin.collections.CollectionsKt;
 import kotlin.text.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.checkers.DebugInfoUtil;
+import org.jetbrains.kotlin.checkers.PositionalTextDiagnostic;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.kt
similarity index 100%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java
rename to compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.kt