diff --git a/jsp/openapi/jsp-openapi.iml b/java/jsp-openapi/jsp-openapi.iml
similarity index 100%
rename from jsp/openapi/jsp-openapi.iml
rename to java/jsp-openapi/jsp-openapi.iml
diff --git a/jsp/openapi/src/com/intellij/codeInspection/JspInspectionGroupNames.java b/java/jsp-openapi/src/com/intellij/codeInspection/JspInspectionGroupNames.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/codeInspection/JspInspectionGroupNames.java
rename to java/jsp-openapi/src/com/intellij/codeInspection/JspInspectionGroupNames.java
diff --git a/jsp/openapi/src/com/intellij/psi/JspPsiUtil.java b/java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/JspPsiUtil.java
rename to java/jsp-openapi/src/com/intellij/psi/JspPsiUtil.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClass.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspClassLevelDeclarationStatement.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspCodeBlock.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspCodeBlock.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspCodeBlock.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspCodeBlock.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspHolderMethod.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspHolderMethod.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspHolderMethod.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspHolderMethod.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspJavaComment.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspJavaComment.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspJavaComment.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspJavaComment.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspMethodCall.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspMethodCall.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspMethodCall.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspMethodCall.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspTemplateStatement.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspTemplateStatement.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspTemplateStatement.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspTemplateStatement.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspWhileStatement.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspWhileStatement.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspWhileStatement.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspWhileStatement.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportList.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportList.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportList.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportList.java
diff --git a/jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportStatement.java b/java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportStatement.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportStatement.java
rename to java/jsp-openapi/src/com/intellij/psi/impl/source/jsp/jspJava/JspxImportStatement.java
diff --git a/jsp/openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
rename to java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspElementVisitor.java
diff --git a/jsp/openapi/src/com/intellij/psi/jsp/JavaJspRecursiveElementVisitor.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspRecursiveElementVisitor.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/jsp/JavaJspRecursiveElementVisitor.java
rename to java/jsp-openapi/src/com/intellij/psi/jsp/JavaJspRecursiveElementVisitor.java
diff --git a/jsp/openapi/src/com/intellij/psi/jsp/JspFile.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/jsp/JspFile.java
rename to java/jsp-openapi/src/com/intellij/psi/jsp/JspFile.java
diff --git a/jsp/openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java b/java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java
rename to java/jsp-openapi/src/com/intellij/psi/jsp/JspImplicitVariable.java
diff --git a/jsp/openapi/src/com/intellij/psi/jsp/package.html b/java/jsp-openapi/src/com/intellij/psi/jsp/package.html
similarity index 100%
rename from jsp/openapi/src/com/intellij/psi/jsp/package.html
rename to java/jsp-openapi/src/com/intellij/psi/jsp/package.html