diff --git a/java/openapi/src/com/intellij/psi/util/EnclosingLoopMatcherExpression.java b/java/java-psi-api/src/com/intellij/psi/util/EnclosingLoopMatcherExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/EnclosingLoopMatcherExpression.java
rename to java/java-psi-api/src/com/intellij/psi/util/EnclosingLoopMatcherExpression.java
diff --git a/java/openapi/src/com/intellij/psi/util/EnclosingLoopOrSwitchMatcherExpression.java b/java/java-psi-api/src/com/intellij/psi/util/EnclosingLoopOrSwitchMatcherExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/EnclosingLoopOrSwitchMatcherExpression.java
rename to java/java-psi-api/src/com/intellij/psi/util/EnclosingLoopOrSwitchMatcherExpression.java
diff --git a/java/openapi/src/com/intellij/psi/util/JavaMatchers.java b/java/java-psi-api/src/com/intellij/psi/util/JavaMatchers.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/JavaMatchers.java
rename to java/java-psi-api/src/com/intellij/psi/util/JavaMatchers.java