diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index ac358fe2e03..f73dc6f3c53 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -25,7 +25,7 @@
           <element id="module-output" name="cli-common" />
           <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="deserialization" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
           <element id="module-output" name="js.dart-ast" />
@@ -39,6 +39,7 @@
           <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 id="module-output" name="serialization" />
         </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 797230cc00e..6d71fbcac17 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -20,6 +20,7 @@
       <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" filepath="$PROJECT_DIR$/core/descriptors.runtime/descriptors.runtime.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/core/deserialization/deserialization.iml" filepath="$PROJECT_DIR$/core/deserialization/deserialization.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
@@ -48,7 +49,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <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$/compiler/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/serialization/serialization.iml" group="compiler" />
       <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" />
     </modules>
diff --git a/build.xml b/build.xml
index 7e2dc502821..d4481735471 100644
--- a/build.xml
+++ b/build.xml
@@ -90,20 +90,21 @@
     </if>
 
     <dirset id="compilerSources.dirset" dir="${basedir}/">
-        <include name="core/descriptors/src"/>
         <include name="core/descriptor.loader.java/src"/>
-        <include name="core/serialization/src"/>
+        <include name="core/descriptors/src"/>
+        <include name="core/deserialization/src"/>
         <include name="core/util.runtime/src"/>
-        <include name="compiler/frontend/src"/>
-        <include name="compiler/frontend.java/src"/>
-        <include name="compiler/backend-common/src"/>
         <include name="compiler/backend/src"/>
+        <include name="compiler/backend-common/src"/>
+        <include name="compiler/builtins-serializer/src"/>
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
-        <include name="compiler/util/src"/>
+        <include name="compiler/frontend/src"/>
+        <include name="compiler/frontend.java/src"/>
         <include name="compiler/light-classes/src"/>
         <include name="compiler/plugin-api/src"/>
-        <include name="compiler/builtins-serializer/src"/>
+        <include name="compiler/serialization/src"/>
+        <include name="compiler/util/src"/>
         <include name="js/js.dart-ast/src"/>
         <include name="js/js.translator/src"/>
         <include name="js/js.frontend/src"/>
@@ -116,6 +117,7 @@
     <patternset id="compilerClassesFromIDEA.fileset">
         <include name="frontend/**"/>
         <include name="descriptors/**"/>
+        <include name="deserialization/**"/>
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
@@ -198,20 +200,21 @@
     <target name="compiler-sources">
         <jar jarfile="${output}/kotlin-compiler-sources.jar">
             <!-- TODO How to convert it from pathset or dirset ? -->
-            <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
-            <fileset dir="core/serialization/src"/>
+            <fileset dir="core/descriptors/src"/>
+            <fileset dir="core/deserialization/src"/>
             <fileset dir="core/util.runtime/src"/>
-            <fileset dir="compiler/frontend/src"/>
-            <fileset dir="compiler/frontend.java/src"/>
-            <fileset dir="compiler/backend-common/src"/>
             <fileset dir="compiler/backend/src"/>
+            <fileset dir="compiler/backend-common/src"/>
+            <fileset dir="compiler/builtins-serializer"/>
             <fileset dir="compiler/cli/src"/>
             <fileset dir="compiler/cli/cli-common/src"/>
-            <fileset dir="compiler/util/src"/>
+            <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/frontend.java/src"/>
             <fileset dir="compiler/light-classes/src"/>
             <fileset dir="compiler/plugin-api/src"/>
-            <fileset dir="compiler/builtins-serializer"/>
+            <fileset dir="compiler/serialization/src"/>
+            <fileset dir="compiler/util/src"/>
             <fileset dir="js/js.dart-ast/src"/>
             <fileset dir="js/js.translator/src"/>
             <fileset dir="js/js.frontend/src"/>
@@ -805,7 +808,7 @@
                 <include name="core/descriptor.loader.java/src"/>
                 <include name="core/descriptors/src"/>
                 <include name="core/descriptors.runtime/src"/>
-                <include name="core/serialization/src"/>
+                <include name="core/deserialization/src"/>
                 <include name="core/util.runtime/src"/>
             </src>
             <class-path>
@@ -890,9 +893,9 @@
                 <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/descriptors/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/descriptors.runtime/src" includes="**/*"/>
+                <fileset dir="${basedir}/core/deserialization/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/>
-                <fileset dir="${basedir}/core/serialization/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/util.runtime/src" includes="**/*"/>
                 <fileset dir="${basedir}/libraries/stdlib/src" includes="**/*"/>
             </jar-content>
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 0ccd254b6a4..6f37b7eda52 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="frontend" exported="" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="deserialization" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="util" />
   </component>
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 8e1b3e7b19e..6da7803e422 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -10,9 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="descriptors" exported="" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="plugin-api" exported="" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/compiler/serialization/serialization.iml b/compiler/serialization/serialization.iml
new file mode 100644
index 00000000000..31b18a14140
--- /dev/null
+++ b/compiler/serialization/serialization.iml
@@ -0,0 +1,16 @@
+<?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="library" name="protobuf-java" level="project" />
+    <orderEntry type="library" name="javax.inject" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="deserialization" exported="" />
+    <orderEntry type="module" module-name="util" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/Interner.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializationUtil.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
rename to compiler/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index 98a121b65a5..cc6f2d0dd17 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/descriptors.debug.proto
+// source: core/deserialization/src/descriptors.debug.proto
 
 package org.jetbrains.kotlin.serialization;
 
@@ -16973,100 +16973,100 @@ public final class DebugProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n.core/serialization/src/descriptors.deb" +
-      "ug.proto\022\"org.jetbrains.kotlin.serializa" +
-      "tion\"\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\310\002\n\022" +
-      "QualifiedNameTable\022\\\n\016qualified_name\030\001 \003" +
-      "(\0132D.org.jetbrains.kotlin.serialization." +
-      "QualifiedNameTable.QualifiedName\032\323\001\n\rQua" +
-      "lifiedName\022!\n\025parent_qualified_name\030\001 \001(" +
-      "\005:\002-1\022\022\n\nshort_name\030\002 \002(\005\022`\n\004kind\030\003 \001(\0162" +
-      "I.org.jetbrains.kotlin.serialization.Qua" +
-      "lifiedNameTable.QualifiedName.Kind:\007PACK",
-      "AGE\")\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\022\t\n\005L" +
-      "OCAL\020\002\"\335\005\n\nAnnotation\022\n\n\002id\030\001 \002(\005\022I\n\010arg" +
-      "ument\030\002 \003(\01327.org.jetbrains.kotlin.seria" +
-      "lization.Annotation.Argument\032\367\004\n\010Argumen" +
-      "t\022\017\n\007name_id\030\001 \002(\005\022L\n\005value\030\002 \002(\0132=.org." +
-      "jetbrains.kotlin.serialization.Annotatio" +
-      "n.Argument.Value\032\213\004\n\005Value\022P\n\004type\030\001 \001(\016" +
-      "2B.org.jetbrains.kotlin.serialization.An" +
-      "notation.Argument.Value.Type\022\021\n\tint_valu" +
-      "e\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014double_v",
-      "alue\030\004 \001(\001\022\024\n\014string_value\030\005 \001(\005\022\020\n\010clas" +
-      "s_id\030\006 \001(\005\022\025\n\renum_value_id\030\007 \001(\005\022B\n\nann" +
-      "otation\030\010 \001(\0132..org.jetbrains.kotlin.ser" +
-      "ialization.Annotation\022T\n\rarray_element\030\t" +
-      " \003(\0132=.org.jetbrains.kotlin.serializatio" +
-      "n.Annotation.Argument.Value\"\230\001\n\004Type\022\010\n\004" +
-      "BYTE\020\000\022\010\n\004CHAR\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004" +
-      "LONG\020\004\022\t\n\005FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\013\n\007BOOLEAN" +
-      "\020\007\022\n\n\006STRING\020\010\022\t\n\005CLASS\020\t\022\010\n\004ENUM\020\n\022\016\n\nA" +
-      "NNOTATION\020\013\022\t\n\005ARRAY\020\014\"\377\004\n\004Type\022I\n\013const",
-      "ructor\030\001 \002(\01324.org.jetbrains.kotlin.seri" +
-      "alization.Type.Constructor\022C\n\010argument\030\002" +
-      " \003(\01321.org.jetbrains.kotlin.serializatio" +
-      "n.Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005false" +
-      "\022%\n\035flexible_type_capabilities_id\030\004 \001(\005\022" +
-      "F\n\024flexible_upper_bound\030\005 \001(\0132(.org.jetb" +
-      "rains.kotlin.serialization.Type\032\220\001\n\013Cons" +
-      "tructor\022N\n\004kind\030\001 \001(\01629.org.jetbrains.ko" +
-      "tlin.serialization.Type.Constructor.Kind" +
-      ":\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000\022\022",
-      "\n\016TYPE_PARAMETER\020\001\032\313\001\n\010Argument\022U\n\nproje" +
-      "ction\030\001 \001(\0162<.org.jetbrains.kotlin.seria" +
-      "lization.Type.Argument.Projection:\003INV\0226" +
-      "\n\004type\030\002 \001(\0132(.org.jetbrains.kotlin.seri" +
-      "alization.Type\"0\n\nProjection\022\006\n\002IN\020\000\022\007\n\003" +
-      "OUT\020\001\022\007\n\003INV\020\002\022\010\n\004STAR\020\003\"\371\001\n\rTypeParamet" +
-      "er\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007reified\030" +
-      "\003 \001(\010:\005false\022Q\n\010variance\030\004 \001(\0162:.org.jet" +
-      "brains.kotlin.serialization.TypeParamete" +
-      "r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o",
-      "rg.jetbrains.kotlin.serialization.Type\"$" +
-      "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\261\005\n" +
-      "\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" +
-      "\005\022\035\n\025companion_object_name\030\004 \001(\005\022I\n\016type" +
-      "_parameter\030\005 \003(\01321.org.jetbrains.kotlin." +
-      "serialization.TypeParameter\022;\n\tsupertype" +
-      "\030\006 \003(\0132(.org.jetbrains.kotlin.serializat" +
-      "ion.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006m" +
-      "ember\030\013 \003(\0132,.org.jetbrains.kotlin.seria" +
-      "lization.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n",
-      "\023primary_constructor\030\r \001(\0132<.org.jetbrai" +
-      "ns.kotlin.serialization.Class.PrimaryCon" +
-      "structor\022K\n\025secondary_constructor\030\016 \003(\0132" +
-      ",.org.jetbrains.kotlin.serialization.Cal" +
-      "lable\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(" +
+      "\n0core/deserialization/src/descriptors.d" +
+      "ebug.proto\022\"org.jetbrains.kotlin.seriali" +
+      "zation\"\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\310\002" +
+      "\n\022QualifiedNameTable\022\\\n\016qualified_name\030\001" +
+      " \003(\0132D.org.jetbrains.kotlin.serializatio" +
+      "n.QualifiedNameTable.QualifiedName\032\323\001\n\rQ" +
+      "ualifiedName\022!\n\025parent_qualified_name\030\001 " +
+      "\001(\005:\002-1\022\022\n\nshort_name\030\002 \002(\005\022`\n\004kind\030\003 \001(" +
+      "\0162I.org.jetbrains.kotlin.serialization.Q" +
+      "ualifiedNameTable.QualifiedName.Kind:\007PA",
+      "CKAGE\")\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\022\t\n" +
+      "\005LOCAL\020\002\"\335\005\n\nAnnotation\022\n\n\002id\030\001 \002(\005\022I\n\010a" +
+      "rgument\030\002 \003(\01327.org.jetbrains.kotlin.ser" +
+      "ialization.Annotation.Argument\032\367\004\n\010Argum" +
+      "ent\022\017\n\007name_id\030\001 \002(\005\022L\n\005value\030\002 \002(\0132=.or" +
+      "g.jetbrains.kotlin.serialization.Annotat" +
+      "ion.Argument.Value\032\213\004\n\005Value\022P\n\004type\030\001 \001" +
+      "(\0162B.org.jetbrains.kotlin.serialization." +
+      "Annotation.Argument.Value.Type\022\021\n\tint_va" +
+      "lue\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014double",
+      "_value\030\004 \001(\001\022\024\n\014string_value\030\005 \001(\005\022\020\n\010cl" +
+      "ass_id\030\006 \001(\005\022\025\n\renum_value_id\030\007 \001(\005\022B\n\na" +
+      "nnotation\030\010 \001(\0132..org.jetbrains.kotlin.s" +
+      "erialization.Annotation\022T\n\rarray_element" +
+      "\030\t \003(\0132=.org.jetbrains.kotlin.serializat" +
+      "ion.Annotation.Argument.Value\"\230\001\n\004Type\022\010" +
+      "\n\004BYTE\020\000\022\010\n\004CHAR\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010" +
+      "\n\004LONG\020\004\022\t\n\005FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\013\n\007BOOLE" +
+      "AN\020\007\022\n\n\006STRING\020\010\022\t\n\005CLASS\020\t\022\010\n\004ENUM\020\n\022\016\n" +
+      "\nANNOTATION\020\013\022\t\n\005ARRAY\020\014\"\377\004\n\004Type\022I\n\013con",
+      "structor\030\001 \002(\01324.org.jetbrains.kotlin.se" +
+      "rialization.Type.Constructor\022C\n\010argument" +
+      "\030\002 \003(\01321.org.jetbrains.kotlin.serializat" +
+      "ion.Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005fal" +
+      "se\022%\n\035flexible_type_capabilities_id\030\004 \001(" +
+      "\005\022F\n\024flexible_upper_bound\030\005 \001(\0132(.org.je" +
+      "tbrains.kotlin.serialization.Type\032\220\001\n\013Co" +
+      "nstructor\022N\n\004kind\030\001 \001(\01629.org.jetbrains." +
+      "kotlin.serialization.Type.Constructor.Ki" +
+      "nd:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000",
+      "\022\022\n\016TYPE_PARAMETER\020\001\032\313\001\n\010Argument\022U\n\npro" +
+      "jection\030\001 \001(\0162<.org.jetbrains.kotlin.ser" +
+      "ialization.Type.Argument.Projection:\003INV" +
+      "\0226\n\004type\030\002 \001(\0132(.org.jetbrains.kotlin.se" +
+      "rialization.Type\"0\n\nProjection\022\006\n\002IN\020\000\022\007" +
+      "\n\003OUT\020\001\022\007\n\003INV\020\002\022\010\n\004STAR\020\003\"\371\001\n\rTypeParam" +
+      "eter\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007reifie" +
+      "d\030\003 \001(\010:\005false\022Q\n\010variance\030\004 \001(\0162:.org.j" +
+      "etbrains.kotlin.serialization.TypeParame" +
+      "ter.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(",
+      ".org.jetbrains.kotlin.serialization.Type" +
+      "\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\261" +
+      "\005\n\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 " +
+      "\002(\005\022\035\n\025companion_object_name\030\004 \001(\005\022I\n\016ty" +
+      "pe_parameter\030\005 \003(\01321.org.jetbrains.kotli" +
+      "n.serialization.TypeParameter\022;\n\tsuperty" +
+      "pe\030\006 \003(\0132(.org.jetbrains.kotlin.serializ" +
+      "ation.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n" +
+      "\006member\030\013 \003(\0132,.org.jetbrains.kotlin.ser" +
+      "ialization.Callable\022\022\n\nenum_entry\030\014 \003(\005\022",
+      "Y\n\023primary_constructor\030\r \001(\0132<.org.jetbr" +
+      "ains.kotlin.serialization.Class.PrimaryC" +
+      "onstructor\022K\n\025secondary_constructor\030\016 \003(" +
       "\0132,.org.jetbrains.kotlin.serialization.C" +
-      "allable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n" +
-      "\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTAT" +
-      "ION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020" +
-      "\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.or",
-      "g.jetbrains.kotlin.serialization.Callabl" +
-      "e*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014" +
-      "getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005" +
-      "\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrains" +
-      ".kotlin.serialization.TypeParameter\022?\n\rr" +
-      "eceiver_type\030\005 \001(\0132(.org.jetbrains.kotli" +
-      "n.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017va" +
-      "lue_parameter\030\007 \003(\0132;.org.jetbrains.kotl" +
-      "in.serialization.Callable.ValueParameter" +
-      "\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.ko",
-      "tlin.serialization.Type\032\263\001\n\016ValueParamet" +
-      "er\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030" +
-      "\003 \002(\0132(.org.jetbrains.kotlin.serializati" +
-      "on.Type\022E\n\023vararg_element_type\030\004 \001(\0132(.o" +
-      "rg.jetbrains.kotlin.serialization.Type*\005" +
-      "\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\r" +
-      "FAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTH" +
-      "ESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL" +
-      "\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010M" +
-      "odality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT",
-      "\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVAT" +
-      "E\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVAT" +
-      "E_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210" +
-      "\001\000"
+      "allable\032P\n\022PrimaryConstructor\022:\n\004data\030\001 " +
+      "\001(\0132,.org.jetbrains.kotlin.serialization" +
+      ".Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022" +
+      "\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOT" +
+      "ATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJEC" +
+      "T\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.",
+      "org.jetbrains.kotlin.serialization.Calla" +
+      "ble*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024" +
+      "\n\014getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001" +
+      "(\005\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrai" +
+      "ns.kotlin.serialization.TypeParameter\022?\n" +
+      "\rreceiver_type\030\005 \001(\0132(.org.jetbrains.kot" +
+      "lin.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017" +
+      "value_parameter\030\007 \003(\0132;.org.jetbrains.ko" +
+      "tlin.serialization.Callable.ValueParamet" +
+      "er\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.",
+      "kotlin.serialization.Type\032\263\001\n\016ValueParam" +
+      "eter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004typ" +
+      "e\030\003 \002(\0132(.org.jetbrains.kotlin.serializa" +
+      "tion.Type\022E\n\023vararg_element_type\030\004 \001(\0132(" +
+      ".org.jetbrains.kotlin.serialization.Type" +
+      "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" +
+      "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" +
+      "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" +
+      "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" +
+      "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA",
+      "CT\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" +
+      "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIV" +
+      "ATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBu" +
+      "f\210\001\000"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
index cbd916edb06..f2a2163d826 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.debug.proto
+// source: core/deserialization/src/builtins.debug.proto
 
 package org.jetbrains.kotlin.serialization.builtins;
 
@@ -77,25 +77,25 @@ public final class DebugBuiltInsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n+core/serialization/src/builtins.debug." +
-      "proto\022+org.jetbrains.kotlin.serializatio" +
-      "n.builtins\032.core/serialization/src/descr" +
-      "iptors.debug.proto:D\n\nclass_name\022+.org.j" +
-      "etbrains.kotlin.serialization.Package\030\226\001" +
-      " \003(\005B\002\020\001:t\n\020class_annotation\022).org.jetbr" +
-      "ains.kotlin.serialization.Class\030\226\001 \003(\0132." +
-      ".org.jetbrains.kotlin.serialization.Anno" +
-      "tation:z\n\023callable_annotation\022,.org.jetb" +
-      "rains.kotlin.serialization.Callable\030\226\001 \003",
+      "\n-core/deserialization/src/builtins.debu" +
+      "g.proto\022+org.jetbrains.kotlin.serializat" +
+      "ion.builtins\0320core/deserialization/src/d" +
+      "escriptors.debug.proto:D\n\nclass_name\022+.o" +
+      "rg.jetbrains.kotlin.serialization.Packag" +
+      "e\030\226\001 \003(\005B\002\020\001:t\n\020class_annotation\022).org.j" +
+      "etbrains.kotlin.serialization.Class\030\226\001 \003" +
       "(\0132..org.jetbrains.kotlin.serialization." +
-      "Annotation:\210\001\n\022compile_time_value\022,.org." +
-      "jetbrains.kotlin.serialization.Callable\030" +
-      "\227\001 \001(\0132=.org.jetbrains.kotlin.serializat" +
-      "ion.Annotation.Argument.Value:\212\001\n\024parame" +
-      "ter_annotation\022;.org.jetbrains.kotlin.se" +
-      "rialization.Callable.ValueParameter\030\226\001 \003" +
-      "(\0132..org.jetbrains.kotlin.serialization." +
-      "AnnotationB\027B\025DebugBuiltInsProtoBuf"
+      "Annotation:z\n\023callable_annotation\022,.org." +
+      "jetbrains.kotlin.serialization.Callable\030",
+      "\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
+      "ion.Annotation:\210\001\n\022compile_time_value\022,." +
+      "org.jetbrains.kotlin.serialization.Calla" +
+      "ble\030\227\001 \001(\0132=.org.jetbrains.kotlin.serial" +
+      "ization.Annotation.Argument.Value:\212\001\n\024pa" +
+      "rameter_annotation\022;.org.jetbrains.kotli" +
+      "n.serialization.Callable.ValueParameter\030" +
+      "\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
+      "ion.AnnotationB\027B\025DebugBuiltInsProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index 629c064d051..4bd65be6481 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -3804,42 +3804,42 @@ public final class DebugJvmProtoBuf {
     java.lang.String[] descriptorData = {
       "\n;core/descriptor.loader.java/src/jvm_de" +
       "scriptors.debug.proto\022&org.jetbrains.kot" +
-      "lin.serialization.jvm\032.core/serializatio" +
-      "n/src/descriptors.debug.proto\"\204\002\n\007JvmTyp" +
-      "e\022U\n\016primitive_type\030\001 \001(\0162=.org.jetbrain" +
-      "s.kotlin.serialization.jvm.JvmType.Primi" +
-      "tiveType\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017array" +
-      "_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010\n\004" +
-      "VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022" +
-      "\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007",
-      "\022\n\n\006DOUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n\004n" +
-      "ame\030\001 \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.jet" +
-      "brains.kotlin.serialization.jvm.JvmType\022" +
-      "G\n\016parameter_type\030\003 \003(\0132/.org.jetbrains." +
-      "kotlin.serialization.jvm.JvmType\"\203\001\n\021Jvm" +
-      "FieldSignature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002 \002" +
-      "(\0132/.org.jetbrains.kotlin.serialization." +
-      "jvm.JvmType\022!\n\022is_static_in_outer\030\003 \001(\010:" +
-      "\005false\"\316\002\n\024JvmPropertySignature\022H\n\005field" +
-      "\030\001 \001(\01329.org.jetbrains.kotlin.serializat",
-      "ion.jvm.JvmFieldSignature\022T\n\020synthetic_m" +
-      "ethod\030\002 \001(\0132:.org.jetbrains.kotlin.seria" +
-      "lization.jvm.JvmMethodSignature\022J\n\006gette" +
-      "r\030\003 \001(\0132:.org.jetbrains.kotlin.serializa" +
-      "tion.jvm.JvmMethodSignature\022J\n\006setter\030\004 " +
-      "\001(\0132:.org.jetbrains.kotlin.serialization" +
-      ".jvm.JvmMethodSignature:\202\001\n\020method_signa" +
-      "ture\022,.org.jetbrains.kotlin.serializatio" +
-      "n.Callable\030d \001(\0132:.org.jetbrains.kotlin." +
-      "serialization.jvm.JvmMethodSignature:\206\001\n",
-      "\022property_signature\022,.org.jetbrains.kotl" +
-      "in.serialization.Callable\030e \001(\0132<.org.je" +
-      "tbrains.kotlin.serialization.jvm.JvmProp" +
-      "ertySignature:E\n\017impl_class_name\022,.org.j" +
-      "etbrains.kotlin.serialization.Callable\030f" +
-      " \001(\005:J\n\005index\022;.org.jetbrains.kotlin.ser" +
-      "ialization.Callable.ValueParameter\030d \001(\005" +
-      "B\022B\020DebugJvmProtoBuf"
+      "lin.serialization.jvm\0320core/deserializat" +
+      "ion/src/descriptors.debug.proto\"\204\002\n\007JvmT" +
+      "ype\022U\n\016primitive_type\030\001 \001(\0162=.org.jetbra" +
+      "ins.kotlin.serialization.jvm.JvmType.Pri" +
+      "mitiveType\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017arr" +
+      "ay_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010" +
+      "\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020" +
+      "\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG",
+      "\020\007\022\n\n\006DOUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n" +
+      "\004name\030\001 \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.j" +
+      "etbrains.kotlin.serialization.jvm.JvmTyp" +
+      "e\022G\n\016parameter_type\030\003 \003(\0132/.org.jetbrain" +
+      "s.kotlin.serialization.jvm.JvmType\"\203\001\n\021J" +
+      "vmFieldSignature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002" +
+      " \002(\0132/.org.jetbrains.kotlin.serializatio" +
+      "n.jvm.JvmType\022!\n\022is_static_in_outer\030\003 \001(" +
+      "\010:\005false\"\316\002\n\024JvmPropertySignature\022H\n\005fie" +
+      "ld\030\001 \001(\01329.org.jetbrains.kotlin.serializ",
+      "ation.jvm.JvmFieldSignature\022T\n\020synthetic" +
+      "_method\030\002 \001(\0132:.org.jetbrains.kotlin.ser" +
+      "ialization.jvm.JvmMethodSignature\022J\n\006get" +
+      "ter\030\003 \001(\0132:.org.jetbrains.kotlin.seriali" +
+      "zation.jvm.JvmMethodSignature\022J\n\006setter\030" +
+      "\004 \001(\0132:.org.jetbrains.kotlin.serializati" +
+      "on.jvm.JvmMethodSignature:\202\001\n\020method_sig" +
+      "nature\022,.org.jetbrains.kotlin.serializat" +
+      "ion.Callable\030d \001(\0132:.org.jetbrains.kotli" +
+      "n.serialization.jvm.JvmMethodSignature:\206",
+      "\001\n\022property_signature\022,.org.jetbrains.ko" +
+      "tlin.serialization.Callable\030e \001(\0132<.org." +
+      "jetbrains.kotlin.serialization.jvm.JvmPr" +
+      "opertySignature:E\n\017impl_class_name\022,.org" +
+      ".jetbrains.kotlin.serialization.Callable" +
+      "\030f \001(\005:J\n\005index\022;.org.jetbrains.kotlin.s" +
+      "erialization.Callable.ValueParameter\030d \001" +
+      "(\005B\022B\020DebugJvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index 0107261fd68..132495f8a5a 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="deserialization" />
     <orderEntry type="module" module-name="util.runtime" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/src/jvm_descriptors.proto b/core/descriptor.loader.java/src/jvm_descriptors.proto
index 91b7f30c345..7040e5e53e8 100644
--- a/core/descriptor.loader.java/src/jvm_descriptors.proto
+++ b/core/descriptor.loader.java/src/jvm_descriptors.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-import "core/serialization/src/descriptors.proto";
+import "core/deserialization/src/descriptors.proto";
 
 option java_outer_classname = "JvmProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/descriptors.runtime/descriptors.runtime.iml b/core/descriptors.runtime/descriptors.runtime.iml
index fd6f22c03b2..fc28ecd9818 100644
--- a/core/descriptors.runtime/descriptors.runtime.iml
+++ b/core/descriptors.runtime/descriptors.runtime.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
-    <orderEntry type="module" module-name="serialization" exported="" />
+    <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util.runtime" />
   </component>
 </module>
\ No newline at end of file
diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml
index 4f067bd8fa8..635cf2db3ee 100644
--- a/core/descriptors/descriptors.iml
+++ b/core/descriptors/descriptors.iml
@@ -8,8 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="deserialization" />
     <orderEntry type="library" exported="" name="builtins" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/core/serialization/serialization.iml b/core/deserialization/deserialization.iml
similarity index 100%
rename from core/serialization/serialization.iml
rename to core/deserialization/deserialization.iml
diff --git a/core/serialization/src/builtins.proto b/core/deserialization/src/builtins.proto
similarity index 95%
rename from core/serialization/src/builtins.proto
rename to core/deserialization/src/builtins.proto
index 6bfe1cdbc47..db9d7ec8e24 100644
--- a/core/serialization/src/builtins.proto
+++ b/core/deserialization/src/builtins.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.builtins;
 
-import "core/serialization/src/descriptors.proto";
+import "core/deserialization/src/descriptors.proto";
 
 option java_outer_classname = "BuiltInsProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/serialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
similarity index 100%
rename from core/serialization/src/descriptors.proto
rename to core/deserialization/src/descriptors.proto
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
similarity index 99%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index 958fd04e511..7156e3b55c9 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/descriptors.proto
+// source: core/deserialization/src/descriptors.proto
 
 package org.jetbrains.kotlin.serialization;
 
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
similarity index 98%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
index 2d7431f98c6..8734bcc2f09 100644
--- a/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.proto
+// source: core/deserialization/src/builtins.proto
 
 package org.jetbrains.kotlin.serialization.builtins;
 
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ErrorReporter.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolver.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
similarity index 100%
rename from core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
diff --git a/generators/generators.iml b/generators/generators.iml
index 7947b675320..bb8ed5bc05b 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="frontend.java" scope="TEST" />
     <orderEntry type="module" module-name="injector-generator" scope="TEST" />
     <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="serialization" scope="TEST" />
+    <orderEntry type="module" module-name="descriptor.loader.java" scope="TEST" />
     <orderEntry type="module" module-name="descriptors.runtime" scope="TEST" />
     <orderEntry type="module" module-name="js.tests" scope="TEST" />
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
@@ -28,6 +28,5 @@
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
     <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="descriptor.loader.java" />
   </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 e4e77dff372..d23012deafe 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -47,8 +47,8 @@ public class ProtoPath(public val file: String) {
 }
 
 public val PROTO_PATHS: List<ProtoPath> = listOf(
-        ProtoPath("core/serialization/src/descriptors.proto"),
-        ProtoPath("core/serialization/src/builtins.proto"),
+        ProtoPath("core/deserialization/src/descriptors.proto"),
+        ProtoPath("core/deserialization/src/builtins.proto"),
         ProtoPath("js/js.serializer/src/js.proto"),
         ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto")
 )
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 5a1abe9bd68..cbd86dafe91 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -14,7 +14,6 @@
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <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="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
     <orderEntry type="module-library">
diff --git a/idea/idea.iml b/idea/idea.iml
index ebc1976e89c..f28c1aa5f0e 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -34,7 +34,6 @@
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <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="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index ab02798a6c6..bae91cce456 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="deserialization" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="util" />
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
index 462b60a72a4..18b3b5645c5 100644
--- a/js/js.frontend/js.frontend.iml
+++ b/js/js.frontend/js.frontend.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="js.dart-ast" exported="" />
     <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="js.serializer" />
   </component>
 </module>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-reflect/pom.xml b/libraries/tools/kotlin-reflect/pom.xml
index 9956006d216..02bd85d63e0 100644
--- a/libraries/tools/kotlin-reflect/pom.xml
+++ b/libraries/tools/kotlin-reflect/pom.xml
@@ -54,8 +54,8 @@
                                     <fileset dir="${basedir}/../../../core/descriptor.loader.java/src"/>
                                     <fileset dir="${basedir}/../../../core/descriptors/src"/>
                                     <fileset dir="${basedir}/../../../core/descriptors.runtime/src"/>
+                                    <fileset dir="${basedir}/../../../core/deserialization/src"/>
                                     <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
-                                    <fileset dir="${basedir}/../../../core/serialization/src"/>
                                     <fileset dir="${basedir}/../../../core/util.runtime/src"/>
                                 </copy>
                             </target>