diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/AndroidAnnotationsSupport.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/AndroidAnnotationsSupport.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/AndroidAnnotationsSupport.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/AndroidAnnotationsSupport.java
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/AnnotationPackageSupport.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/AnnotationPackageSupport.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/AnnotationPackageSupport.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/AnnotationPackageSupport.java
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/CheckerFrameworkSupport.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/CheckerFrameworkSupport.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/CheckerFrameworkSupport.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/CheckerFrameworkSupport.java
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/FindBugsAnnotationsSupport.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/FindBugsAnnotationsSupport.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/FindBugsAnnotationsSupport.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/FindBugsAnnotationsSupport.java
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/JetBrainsAnnotationsSupport.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/JetBrainsAnnotationsSupport.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/JetBrainsAnnotationsSupport.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/JetBrainsAnnotationsSupport.java
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/annoPackages/Jsr305Support.java b/java/java-impl/src/com/intellij/codeInsight/annoPackages/Jsr305Support.java
similarity index 100%
rename from java/java-psi-api/src/com/intellij/codeInsight/annoPackages/Jsr305Support.java
rename to java/java-impl/src/com/intellij/codeInsight/annoPackages/Jsr305Support.java