diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index b8b806e8e02..daacc07ec9c 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -64,7 +64,7 @@
      </action>
 
      <group id="EditorGutterKotlinPopupMenu">
-       <action id="ShowKotlinSignatures" class="org.jetbrains.jet.plugin.codeInsight.ShowKotlinSignaturesAction"/>
+       <action id="ShowKotlinSignatures" class="org.jetbrains.jet.plugin.codeInsight.ktSignature.ShowKotlinSignaturesAction"/>
        <add-to-group group-id="EditorGutterPopupMenu" anchor="last" />
      </group>
   </actions>
@@ -175,7 +175,7 @@
       <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationProducer"/>
       <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetJUnitConfigurationProducer"/>
       <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetLineMarkerProvider"/>
-      <codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.codeInsight.KotlinSignatureInJavaMarkerProvider"/>
+      <codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerProvider"/>
       <iconProvider implementation="org.jetbrains.jet.plugin.JetIconProvider"/>
       <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetFunctionPresenter" forClass="org.jetbrains.jet.lang.psi.JetNamedFunction"/>
       <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetClassPresenter" forClass="org.jetbrains.jet.lang.psi.JetClass"/>
@@ -229,7 +229,7 @@
       </intentionAction>
 
       <intentionAction>
-        <className>org.jetbrains.jet.plugin.codeInsight.AddKotlinSignatureAnnotation</className>
+        <className>org.jetbrains.jet.plugin.codeInsight.ktSignature.AddKotlinSignatureAnnotation</className>
         <category>Kotlin</category>
       </intentionAction>
 
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/AddKotlinSignatureAnnotation.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/codeInsight/AddKotlinSignatureAnnotation.java
rename to idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
index b0c4989b2ca..1bc206d8ac8 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/AddKotlinSignatureAnnotation.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.codeInsight;
+package org.jetbrains.jet.plugin.codeInsight.ktSignature;
 
 import com.intellij.codeInsight.ExternalAnnotationsListener;
 import com.intellij.codeInsight.ExternalAnnotationsManager;
-import com.intellij.codeInsight.PsiEquivalenceUtil;
 import com.intellij.codeInsight.intention.AddAnnotationFix;
 import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
 import com.intellij.openapi.application.ApplicationManager;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/EditSignatureBalloon.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/codeInsight/EditSignatureBalloon.java
rename to idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java
index 422db736633..8ac0c76c2be 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/EditSignatureBalloon.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.codeInsight;
+package org.jetbrains.jet.plugin.codeInsight.ktSignature;
 
 import com.intellij.codeInsight.ExternalAnnotationsManager;
 import com.intellij.openapi.application.Result;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinSignatureInJavaMarkerProvider.java
rename to idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
index 8002fd22bc5..cdf972cca3b 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinSignatureInJavaMarkerProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/KotlinSignatureInJavaMarkerProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.codeInsight;
+package org.jetbrains.jet.plugin.codeInsight.ktSignature;
 
 import com.intellij.codeHighlighting.Pass;
 import com.intellij.codeInsight.ExternalAnnotationsManager;
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShowKotlinSignaturesAction.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java
similarity index 96%
rename from idea/src/org/jetbrains/jet/plugin/codeInsight/ShowKotlinSignaturesAction.java
rename to idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java
index 62cf12b342c..449bf9cfbdd 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ShowKotlinSignaturesAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/ShowKotlinSignaturesAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.codeInsight;
+package org.jetbrains.jet.plugin.codeInsight.ktSignature;
 
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.actionSystem.AnActionEvent;