diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt
index 279988f3557..ffe53d508e0 100644
--- a/idea/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.inspections
 
-import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention
+import org.jetbrains.jet.lang.psi.JetPrefixExpression
 
 public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index 79bce749d08..08e7f4f9da8 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -17,19 +17,18 @@
 package org.jetbrains.jet.plugin.intentions
 
 import org.jetbrains.jet.lang.psi.JetPrefixExpression
+import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
-import org.jetbrains.jet.lexer.JetTokens
-import org.jetbrains.jet.lang.psi.JetBinaryExpression
-import org.jetbrains.jet.lang.psi.JetPsiFactory
-import com.intellij.openapi.editor.Editor
+import org.jetbrains.jet.lexer.JetToken
+import org.jetbrains.jet.lexer.JetSingleValueToken
 import org.jetbrains.jet.lang.psi.JetOperationExpression
 import org.jetbrains.jet.lang.psi.JetIsExpression
-import org.jetbrains.jet.lexer.JetToken
-import org.jetbrains.jet.lang.psi.JetExpression
+import org.jetbrains.jet.lang.psi.JetBinaryExpression
+import com.intellij.openapi.editor.Editor
+import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.psi.JetPsiUtil
-import org.jetbrains.jet.lexer.JetSingleValueToken
 import org.jetbrains.jet.plugin.JetBundle
-
+import org.jetbrains.jet.lang.psi.JetPsiFactory
 
 public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {