diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f209bfe7684..467bf1abcb9 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -153,8 +153,8 @@
       <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortFunctionNameIndex"/>
       <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetExtensionFunctionNameIndex"/>
 
-      <contentBasedClassFileProcessor implementation="org.jetbrains.jet.plugin.JetContentBasedFileSubstitutor" />
-      <psi.clsCustomNavigationPolicy implementation="org.jetbrains.jet.plugin.JetClsNavigationPolicy" />
+      <contentBasedClassFileProcessor implementation="org.jetbrains.jet.plugin.libraries.JetContentBasedFileSubstitutor" />
+      <psi.clsCustomNavigationPolicy implementation="org.jetbrains.jet.plugin.libraries.JetClsNavigationPolicy" />
 
       <editorNotificationProvider implementation="org.jetbrains.jet.plugin.quickfix.ConfigureKotlinLibraryNotificationProvider"/>
 
diff --git a/idea/src/org/jetbrains/jet/plugin/JetClsNavigationPolicy.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java
similarity index 94%
rename from idea/src/org/jetbrains/jet/plugin/JetClsNavigationPolicy.java
rename to idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java
index 4499dce73cf..7b4b689afd0 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetClsNavigationPolicy.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.libraries;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.compiled.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
+import org.jetbrains.jet.plugin.libraries.JetDecompiledData;
 
 /**
  * @author Evgeny Gerashchenko
diff --git a/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java
similarity index 93%
rename from idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
rename to idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java
index 0145296c867..acf14b819b8 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.libraries;
 
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.ContentBasedClassFileProcessor;
@@ -24,6 +24,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.compiled.ClsFileImpl;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.JetHighlighter;
+import org.jetbrains.jet.plugin.libraries.JetDecompiledData;
 
 /**
  * @author Evgeny Gerashchenko
diff --git a/idea/src/org/jetbrains/jet/plugin/JetDecompiledData.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetDecompiledData.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/JetDecompiledData.java
rename to idea/src/org/jetbrains/jet/plugin/libraries/JetDecompiledData.java
index 17a1c39a26d..034bd9a14f7 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetDecompiledData.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetDecompiledData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.libraries;
 
 import com.intellij.ide.highlighter.JavaClassFileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
diff --git a/idea/src/org/jetbrains/jet/plugin/JetDummyClassFileViewProvider.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/JetDummyClassFileViewProvider.java
rename to idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java
index ae26a36e3e3..caa76020665 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetDummyClassFileViewProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin;
+package org.jetbrains.jet.plugin.libraries;
 
 import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Document;
@@ -26,6 +26,7 @@ import com.intellij.psi.impl.source.tree.LeafElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.plugin.JetLanguage;
 
 import java.util.Collections;
 import java.util.List;