diff --git a/jsp/jsp-base-openapi/jsp-base-openapi.iml b/java/jsp-base-openapi/jsp-base-openapi.iml
similarity index 100%
rename from jsp/jsp-base-openapi/jsp-base-openapi.iml
rename to java/jsp-base-openapi/jsp-base-openapi.iml
diff --git a/jsp/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java
rename to java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java
rename to java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java
rename to java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java b/java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java
rename to java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/openapi/editor/JspHighlighterColors.java b/java/jsp-base-openapi/src/com/intellij/openapi/editor/JspHighlighterColors.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/openapi/editor/JspHighlighterColors.java
rename to java/jsp-base-openapi/src/com/intellij/openapi/editor/JspHighlighterColors.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDeclaration.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDeclaration.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDeclaration.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDeclaration.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDirective.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDirective.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDirective.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspDirective.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspExpression.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspExpression.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspExpression.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspExpression.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspScriptlet.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspScriptlet.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspScriptlet.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspScriptlet.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspTag.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspTag.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspTag.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspTag.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlRootTag.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlRootTag.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlRootTag.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlRootTag.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlTagBase.java b/java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlTagBase.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlTagBase.java
rename to java/jsp-base-openapi/src/com/intellij/psi/impl/source/jsp/jspXml/JspXmlTagBase.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java b/java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java
rename to java/jsp-base-openapi/src/com/intellij/psi/jsp/BaseJspFile.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/jsp/JspDirectiveKind.java b/java/jsp-base-openapi/src/com/intellij/psi/jsp/JspDirectiveKind.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/jsp/JspDirectiveKind.java
rename to java/jsp-base-openapi/src/com/intellij/psi/jsp/JspDirectiveKind.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/jsp/JspTokenType.java b/java/jsp-base-openapi/src/com/intellij/psi/jsp/JspTokenType.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/jsp/JspTokenType.java
rename to java/jsp-base-openapi/src/com/intellij/psi/jsp/JspTokenType.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/tree/jsp/IJspElementType.java b/java/jsp-base-openapi/src/com/intellij/psi/tree/jsp/IJspElementType.java
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/tree/jsp/IJspElementType.java
rename to java/jsp-base-openapi/src/com/intellij/psi/tree/jsp/IJspElementType.java
diff --git a/jsp/jsp-base-openapi/src/com/intellij/psi/tree/jsp/package.html b/java/jsp-base-openapi/src/com/intellij/psi/tree/jsp/package.html
similarity index 100%
rename from jsp/jsp-base-openapi/src/com/intellij/psi/tree/jsp/package.html
rename to java/jsp-base-openapi/src/com/intellij/psi/tree/jsp/package.html