diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index b470d601b60..b464ca62c8d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -356,7 +356,7 @@
     <configurationType implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSRunConfigurationType"/>
     <programRunner implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSBrowserProgramRunner"/>
     <configurationProducer implementation="org.jetbrains.kotlin.idea.run.JetRunConfigurationProducer"/>
-    <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetLineMarkerProvider"/>
+    <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.JetLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="JAVA"
                                     implementationClass="org.jetbrains.kotlin.idea.ktSignature.KotlinSignatureInJavaMarkerProvider"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JetLineMarkerProvider.kt
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.kt
rename to idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JetLineMarkerProvider.kt
index 46f5e2f196c..e5ea4774ce8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/JetLineMarkerProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.highlighter
+package org.jetbrains.kotlin.idea.highlighter.markers
 
 import com.google.common.collect.Maps
 import com.google.common.collect.Sets
@@ -27,26 +27,19 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.editor.markup.GutterIconRenderer
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.DumbService
-import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.search.searches.ClassInheritorsSearch
 import com.intellij.util.NullableFunction
-import kotlin.KotlinPackage
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.idea.highlighter.markers.*
-import org.jetbrains.kotlin.idea.highlighter.markers.ResolveWithParentsResult
-import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler
-import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerTooltip
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.*
-
-import javax.swing.*
+import org.jetbrains.kotlin.psi.psiUtil.isOverridable
 import java.awt.event.MouseEvent
+import javax.swing.Icon
 
 public class JetLineMarkerProvider : LineMarkerProvider {
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
index a2006748771..473b450a64d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
@@ -40,7 +40,7 @@ import javax.swing.JComponent
 import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator
 import com.intellij.psi.NavigatablePsiElement
 import com.intellij.util.Function
-import org.jetbrains.kotlin.idea.highlighter.JetLineMarkerProvider
+import org.jetbrains.kotlin.idea.highlighter.markers.JetLineMarkerProvider
 
 fun getOverriddenPropertyTooltip(property: JetProperty): String? {
     val overriddenInClassesProcessor = PsiElementProcessor.CollectElementsWithLimit<PsiClass>(5)