diff --git a/java/java-psi-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java b/java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java b/java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/VariableData.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/VariableData.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/VariableData.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/VariableData.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/BreakReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/BreakReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/BreakReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/BreakReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ConditionalReturnStatementValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ConditionalReturnStatementValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ConditionalReturnStatementValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ConditionalReturnStatementValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ContinueReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ContinueReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ContinueReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ContinueReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ExpressionReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ExpressionReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ExpressionReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ExpressionReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/FieldReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/FieldReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/FieldReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/FieldReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/GotoReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/GotoReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/GotoReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/GotoReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/Match.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/Match.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ReturnStatementReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ReturnStatementReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ReturnStatementReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ReturnStatementReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/ReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ReturnValue.java
diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/VariableReturnValue.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/VariableReturnValue.java
similarity index 100%
rename from java/java-psi-impl/src/com/intellij/refactoring/util/duplicates/VariableReturnValue.java
rename to java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/VariableReturnValue.java
diff --git a/java/java-psi-impl/java-psi-impl.iml b/java/java-psi-impl/java-psi-impl.iml
index a53ad4d1e4eb..89e9dba328f0 100644
--- a/java/java-psi-impl/java-psi-impl.iml
+++ b/java/java-psi-impl/java-psi-impl.iml
@@ -11,7 +11,6 @@
-