diff --git a/java/openapi/src/com/intellij/patterns/PsiAnnotationPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiAnnotationPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiAnnotationPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiAnnotationPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiBinaryExpressionPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiBinaryExpressionPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiBinaryExpressionPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiBinaryExpressionPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiClassPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiClassPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiClassPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiClassPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiExpressionPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiExpressionPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiExpressionPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiExpressionPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiFieldPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiFieldPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiFieldPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiFieldPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiJavaElementPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiJavaElementPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiJavaElementPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiJavaElementPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiJavaPatterns.java b/java/java-psi-api/src/com/intellij/patterns/PsiJavaPatterns.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiJavaPatterns.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiJavaPatterns.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiMemberPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiMemberPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiMemberPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiMethodCallPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiMethodCallPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiMethodCallPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiMethodCallPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiMethodPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiMethodPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiMethodPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiMethodPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiModifierListOwnerPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiModifierListOwnerPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiModifierListOwnerPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiModifierListOwnerPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiNameValuePairPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiNameValuePairPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiNameValuePairPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiNameValuePairPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiParameterPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiParameterPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiParameterPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiParameterPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiStatementPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiStatementPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiStatementPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiStatementPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiTypeCastExpressionPattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiTypeCastExpressionPattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiTypeCastExpressionPattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiTypeCastExpressionPattern.java
diff --git a/java/openapi/src/com/intellij/patterns/PsiTypePattern.java b/java/java-psi-api/src/com/intellij/patterns/PsiTypePattern.java
similarity index 100%
rename from java/openapi/src/com/intellij/patterns/PsiTypePattern.java
rename to java/java-psi-api/src/com/intellij/patterns/PsiTypePattern.java