diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 719f52019c5..67a242e240b 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -26,7 +26,6 @@
           <element id="module-output" name="idea-jps-common" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="serialization" />
-          <element id="module-output" name="serialization.js" />
           <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
@@ -40,6 +39,7 @@
           <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
+          <element id="module-output" name="js.serializer" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index dc0a656a7a2..daa84b9dddc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -49,7 +49,6 @@
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/serialization.js/serialization.js.iml" filepath="$PROJECT_DIR$/core/serialization.js/serialization.js.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" filepath="$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
diff --git a/build.xml b/build.xml
index 9f02b21df15..9a7b3dc841f 100644
--- a/build.xml
+++ b/build.xml
@@ -93,7 +93,6 @@
         <include name="core/descriptors/src"/>
         <include name="core/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
-        <include name="core/serialization.js/src"/>
         <include name="core/serialization.jvm/src"/>
         <include name="core/util.runtime/src"/>
         <include name="compiler/frontend/src"/>
@@ -121,7 +120,6 @@
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
-        <include name="serialization.js/**"/>
         <include name="serialization.jvm/**"/>
         <include name="backend/**"/>
         <include name="backend-common/**"/>
@@ -188,7 +186,6 @@
             <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
             <fileset dir="core/serialization/src"/>
-            <fileset dir="core/serialization.js/src"/>
             <fileset dir="core/serialization.jvm/src"/>
             <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/frontend/src"/>
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index a9a60a5d830..79046c69b61 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -15,11 +15,11 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="descriptors.runtime" />
     <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="util" />
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
index 82d40a55df7..22573dc2adf 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.js/src/js.debug.proto
+// source: js/js.serializer/src/js.debug.proto
 
 package org.jetbrains.kotlin.serialization.js;
 
@@ -1292,12 +1292,12 @@ public final class DebugJsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n(core/serialization.js/src/js.debug.pro" +
-      "to\022%org.jetbrains.kotlin.serialization.j" +
-      "s\"~\n\007Library\022G\n\005entry\030\001 \003(\01328.org.jetbra" +
-      "ins.kotlin.serialization.js.Library.File" +
-      "Entry\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007cont" +
-      "ent\030\002 \002(\014B\021B\017DebugJsProtoBuf"
+      "\n#js/js.serializer/src/js.debug.proto\022%o" +
+      "rg.jetbrains.kotlin.serialization.js\"~\n\007" +
+      "Library\022G\n\005entry\030\001 \003(\01328.org.jetbrains.k" +
+      "otlin.serialization.js.Library.FileEntry" +
+      "\032*\n\tFileEntry\022\014\n\004path\030\001 \002(\t\022\017\n\007content\030\002" +
+      " \002(\014B\021B\017DebugJsProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/core/serialization.js/serialization.js.iml b/core/serialization.js/serialization.js.iml
deleted file mode 100644
index 1e5af8fbb69..00000000000
--- a/core/serialization.js/serialization.js.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="util.runtime" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index 704e4334e75..f1870878c00 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -51,7 +51,7 @@ public data class ProtoPath(
 public val PROTO_PATHS: List<ProtoPath> = listOf(
         ProtoPath("core/serialization/src/descriptors.proto", "core/serialization/src"),
         ProtoPath("core/serialization/src/builtins.proto", "core/serialization/src"),
-        ProtoPath("core/serialization.js/src/js.proto", "core/serialization.js/src"),
+        ProtoPath("js/js.serializer/src/js.proto", "js/js.serializer/src"),
         ProtoPath("core/serialization.jvm/src/jvm_descriptors.proto", "core/serialization.jvm/src")
 )
 
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 6e0b6dc9b35..9e533e83d7c 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -15,7 +15,6 @@
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
@@ -30,6 +29,7 @@
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
     <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="module" module-name="ide-common" exported="" />
     <orderEntry type="module" module-name="util" />
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
index 8ead2455283..462b60a72a4 100644
--- a/js/js.frontend/js.frontend.iml
+++ b/js/js.frontend/js.frontend.iml
@@ -13,6 +13,6 @@
     <orderEntry type="module" module-name="js.parser" exported="" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
+    <orderEntry type="module" module-name="js.serializer" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.serializer/js.serializer.iml b/js/js.serializer/js.serializer.iml
index 59e4679c930..1fa76050f80 100644
--- a/js/js.serializer/js.serializer.iml
+++ b/js/js.serializer/js.serializer.iml
@@ -9,7 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
diff --git a/core/serialization.js/src/js.proto b/js/js.serializer/src/js.proto
similarity index 100%
rename from core/serialization.js/src/js.proto
rename to js/js.serializer/src/js.proto
diff --git a/core/serialization.js/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
similarity index 99%
rename from core/serialization.js/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
rename to js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
index f51129193a9..fcce951d365 100644
--- a/core/serialization.js/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.js/src/js.proto
+// source: js/js.serializer/src/js.proto
 
 package org.jetbrains.kotlin.serialization.js;
 
diff --git a/core/serialization.js/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
similarity index 100%
rename from core/serialization.js/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
rename to js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt