diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
similarity index 92%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
index ba11d2ccbf9..3a773315ac6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt
@@ -17,25 +17,19 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.psi.JetCallExpression
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall
-import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.resolve.scopes.JetScope
-import org.jetbrains.kotlin.psi.JetTypeProjection
-import org.jetbrains.kotlin.psi.Call
 import org.jetbrains.kotlin.di.InjectorForMacros
-import org.jetbrains.kotlin.resolve.BindingTraceContext
-import org.jetbrains.kotlin.psi.JetProperty
-import org.jetbrains.kotlin.psi.JetTypeArgumentList
-import org.jetbrains.kotlin.psi.JetReturnExpression
-import org.jetbrains.kotlin.psi.JetDeclarationWithBody
-import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
-import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
-import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
-import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
-import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
+import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.BindingTraceContext
+import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall
+import org.jetbrains.kotlin.resolve.scopes.JetScope
+import org.jetbrains.kotlin.types.TypeUtils
 
 public class RemoveExplicitTypeArguments : JetSelfTargetingOffsetIndependentIntention<JetTypeArgumentList>(
         "remove.explicit.type.arguments", javaClass()) {
@@ -91,4 +85,4 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingOffsetIndependentInte
     override fun applyTo(element: JetTypeArgumentList, editor: Editor) {
         element.delete()
     }
-}
+}
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
similarity index 86%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index 4cee2cd55d8..e30a4a3029b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.idea.intentions
 
-import org.jetbrains.kotlin.lexer.JetToken
-import org.jetbrains.kotlin.lexer.JetSingleValueToken
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.lexer.JetSingleValueToken
+import org.jetbrains.kotlin.lexer.JetToken
+import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.*
 
 public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIndependentIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {
@@ -30,20 +30,20 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIn
     }
 
     public fun JetToken.negate(): JetSingleValueToken? = when (this) {
-        JetTokens.IN_KEYWORD    -> JetTokens.NOT_IN
-        JetTokens.NOT_IN        -> JetTokens.IN_KEYWORD
+        JetTokens.IN_KEYWORD -> JetTokens.NOT_IN
+        JetTokens.NOT_IN -> JetTokens.IN_KEYWORD
 
-        JetTokens.IS_KEYWORD    -> JetTokens.NOT_IS
-        JetTokens.NOT_IS        -> JetTokens.IS_KEYWORD
+        JetTokens.IS_KEYWORD -> JetTokens.NOT_IS
+        JetTokens.NOT_IS -> JetTokens.IS_KEYWORD
 
-        JetTokens.EQEQ          -> JetTokens.EXCLEQ
-        JetTokens.EXCLEQ        -> JetTokens.EQEQ
+        JetTokens.EQEQ -> JetTokens.EXCLEQ
+        JetTokens.EXCLEQ -> JetTokens.EQEQ
 
-        JetTokens.LT            -> JetTokens.GTEQ
-        JetTokens.GTEQ          -> JetTokens.LT
+        JetTokens.LT -> JetTokens.GTEQ
+        JetTokens.GTEQ -> JetTokens.LT
 
-        JetTokens.GT            -> JetTokens.LTEQ
-        JetTokens.LTEQ          -> JetTokens.GT
+        JetTokens.GT -> JetTokens.LTEQ
+        JetTokens.LTEQ -> JetTokens.GT
 
         else -> null
     }
@@ -89,4 +89,4 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingOffsetIn
                 }
         )
     }
-}
+}
\ No newline at end of file