diff --git a/jsp/spi/jsp-spi.iml b/java/jsp-spi/jsp-spi.iml
similarity index 100%
rename from jsp/spi/jsp-spi.iml
rename to java/jsp-spi/jsp-spi.iml
diff --git a/jsp/spi/src/com/intellij/jsp/impl/CustomTagDescriptorBase.java b/java/jsp-spi/src/com/intellij/jsp/impl/CustomTagDescriptorBase.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/CustomTagDescriptorBase.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/CustomTagDescriptorBase.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/FunctionDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/FunctionDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/FunctionDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/FunctionDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/JspElementDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/JspElementDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/JspElementDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/JspElementDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/JspNsDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/JspNsDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/JspNsDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/JspNsDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/TldDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/TldDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/TldDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/TldDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/TldTagDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/TldTagDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/TldTagDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/TldTagDescriptor.java
diff --git a/jsp/spi/src/com/intellij/jsp/impl/TldTagFileDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/TldTagFileDescriptor.java
similarity index 100%
rename from jsp/spi/src/com/intellij/jsp/impl/TldTagFileDescriptor.java
rename to java/jsp-spi/src/com/intellij/jsp/impl/TldTagFileDescriptor.java
diff --git a/jsp/spi/src/com/intellij/psi/impl/source/jsp/JspContextManager.java b/java/jsp-spi/src/com/intellij/psi/impl/source/jsp/JspContextManager.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/impl/source/jsp/JspContextManager.java
rename to java/jsp-spi/src/com/intellij/psi/impl/source/jsp/JspContextManager.java
diff --git a/jsp/spi/src/com/intellij/psi/impl/source/jsp/JspManager.java b/java/jsp-spi/src/com/intellij/psi/impl/source/jsp/JspManager.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/impl/source/jsp/JspManager.java
rename to java/jsp-spi/src/com/intellij/psi/impl/source/jsp/JspManager.java
diff --git a/jsp/spi/src/com/intellij/psi/impl/source/jsp/jspJava/JspExpressionStatement.java b/java/jsp-spi/src/com/intellij/psi/impl/source/jsp/jspJava/JspExpressionStatement.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/impl/source/jsp/jspJava/JspExpressionStatement.java
rename to java/jsp-spi/src/com/intellij/psi/impl/source/jsp/jspJava/JspExpressionStatement.java
diff --git a/jsp/spi/src/com/intellij/psi/jsp/AbstractJspJavaLexer.java b/java/jsp-spi/src/com/intellij/psi/jsp/AbstractJspJavaLexer.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/jsp/AbstractJspJavaLexer.java
rename to java/jsp-spi/src/com/intellij/psi/jsp/AbstractJspJavaLexer.java
diff --git a/jsp/spi/src/com/intellij/psi/jsp/JspElementType.java b/java/jsp-spi/src/com/intellij/psi/jsp/JspElementType.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/jsp/JspElementType.java
rename to java/jsp-spi/src/com/intellij/psi/jsp/JspElementType.java
diff --git a/jsp/spi/src/com/intellij/psi/jsp/JspSpiUtil.java b/java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java
similarity index 100%
rename from jsp/spi/src/com/intellij/psi/jsp/JspSpiUtil.java
rename to java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java