From 575a388b113316754cba16313dcdb9bfafdf7cf4 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 1 Mar 2018 12:07:29 +0100
Subject: [PATCH] Move core protobuf schemas to 'metadata' and 'metadata.jvm'

---
 build-common/src/java_descriptors.proto       |   2 +-
 .../DebugExtOptionsProtoBuf.java              |  22 +-
 .../kotlin/serialization/DebugProtoBuf.java   | 387 +++++++++---------
 .../builtins/DebugBuiltInsProtoBuf.java       |  70 ++--
 .../java/DebugJavaClassProtoBuf.java          |  28 +-
 .../serialization/js/DebugJsProtoBuf.java     | 122 +++---
 .../jvm/DebugJvmModuleProtoBuf.java           |  44 +-
 .../serialization/jvm/DebugJvmProtoBuf.java   | 122 +++---
 .../kotlin/load/kotlin/JvmMetadataVersion.kt  |   2 +-
 .../kotlin/builtins/BuiltInsBinaryVersion.kt  |   2 +-
 .../src/jvm_metadata.proto}                   |   4 +-
 .../src/jvm_module.proto                      |   2 +-
 .../serialization/jvm/JvmModuleProtoBuf.java  |   2 +-
 .../kotlin/serialization/jvm/JvmProtoBuf.java |   2 +-
 .../src/builtins.proto                        |   2 +-
 .../src/ext_options.proto                     |   0
 .../src/google/protobuf/descriptor.proto      |   0
 .../src/metadata.proto}                       |   2 +-
 .../kotlin/serialization/ProtoBuf.java        |   2 +-
 .../builtins/BuiltInsProtoBuf.java            |   2 +-
 .../generators/protobuf/GenerateProtoBuf.kt   |  12 +-
 js/js.serializer/src/js.proto                 |   2 +-
 22 files changed, 416 insertions(+), 417 deletions(-)
 rename core/{descriptors.jvm/src/jvm_descriptors.proto => metadata.jvm/src/jvm_metadata.proto} (97%)
 rename core/{descriptors.jvm => metadata.jvm}/src/jvm_module.proto (98%)
 rename core/{descriptors.jvm => metadata.jvm}/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java (99%)
 rename core/{descriptors.jvm => metadata.jvm}/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java (99%)
 rename core/{deserialization => metadata}/src/builtins.proto (96%)
 rename core/{deserialization => metadata}/src/ext_options.proto (100%)
 rename core/{deserialization => metadata}/src/google/protobuf/descriptor.proto (100%)
 rename core/{deserialization/src/descriptors.proto => metadata/src/metadata.proto} (99%)
 rename core/{deserialization => metadata}/src/org/jetbrains/kotlin/serialization/ProtoBuf.java (99%)
 rename core/{deserialization => metadata}/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java (99%)

diff --git a/build-common/src/java_descriptors.proto b/build-common/src/java_descriptors.proto
index d5ca422346b..df0c902fdd8 100644
--- a/build-common/src/java_descriptors.proto
+++ b/build-common/src/java_descriptors.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.java;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JavaClassProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
index 48a3be525e9..221b709695c 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/deserialization/src/ext_options.debug.proto
+// source: core/metadata/src/ext_options.debug.proto
 
 package org.jetbrains.kotlin.serialization;
 
@@ -65,16 +65,16 @@ public final class DebugExtOptionsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n0core/deserialization/src/ext_options.d" +
-      "ebug.proto\022\"org.jetbrains.kotlin.seriali" +
-      "zation\032 google/protobuf/descriptor.proto" +
-      ":;\n\022skip_in_comparison\022\035.google.protobuf" +
-      ".FieldOptions\030\320\206\003 \001(\010:9\n\020name_id_in_tabl" +
-      "e\022\035.google.protobuf.FieldOptions\030\321\206\003 \001(\010" +
-      ":<\n\023fq_name_id_in_table\022\035.google.protobu" +
-      "f.FieldOptions\030\322\206\003 \001(\010:;\n\022string_id_in_t" +
-      "able\022\035.google.protobuf.FieldOptions\030\323\206\003 " +
-      "\001(\010B\031B\027DebugExtOptionsProtoBuf"
+      "\n)core/metadata/src/ext_options.debug.pr" +
+      "oto\022\"org.jetbrains.kotlin.serialization\032" +
+      " google/protobuf/descriptor.proto:;\n\022ski" +
+      "p_in_comparison\022\035.google.protobuf.FieldO" +
+      "ptions\030\320\206\003 \001(\010:9\n\020name_id_in_table\022\035.goo" +
+      "gle.protobuf.FieldOptions\030\321\206\003 \001(\010:<\n\023fq_" +
+      "name_id_in_table\022\035.google.protobuf.Field" +
+      "Options\030\322\206\003 \001(\010:;\n\022string_id_in_table\022\035." +
+      "google.protobuf.FieldOptions\030\323\206\003 \001(\010B\031B\027" +
+      "DebugExtOptionsProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index a4570891db9..d256c0d05ce 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/deserialization/src/descriptors.debug.proto
+// source: core/metadata/src/metadata.debug.proto
 
 package org.jetbrains.kotlin.serialization;
 
@@ -33421,201 +33421,200 @@ public final class DebugProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n0core/deserialization/src/descriptors.d" +
-      "ebug.proto\022\"org.jetbrains.kotlin.seriali" +
-      "zation\0320core/deserialization/src/ext_opt" +
-      "ions.debug.proto\"\035\n\013StringTable\022\016\n\006strin" +
-      "g\030\001 \003(\t\"\310\002\n\022QualifiedNameTable\022\\\n\016qualif" +
-      "ied_name\030\001 \003(\0132D.org.jetbrains.kotlin.se" +
-      "rialization.QualifiedNameTable.Qualified" +
-      "Name\032\323\001\n\rQualifiedName\022!\n\025parent_qualifi" +
-      "ed_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.seria",
-      "lization.QualifiedNameTable.QualifiedNam" +
-      "e.Kind:\007PACKAGE\")\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PA" +
-      "CKAGE\020\001\022\t\n\005LOCAL\020\002\"\373\005\n\nAnnotation\022\020\n\002id\030" +
-      "\001 \002(\005B\004\220\265\030\001\022I\n\010argument\030\002 \003(\01327.org.jetb" +
+      "\n&core/metadata/src/metadata.debug.proto" +
+      "\022\"org.jetbrains.kotlin.serialization\032)co" +
+      "re/metadata/src/ext_options.debug.proto\"" +
+      "\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\310\002\n\022Quali" +
+      "fiedNameTable\022\\\n\016qualified_name\030\001 \003(\0132D." +
+      "org.jetbrains.kotlin.serialization.Quali" +
+      "fiedNameTable.QualifiedName\032\323\001\n\rQualifie" +
+      "dName\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.Qualifie",
+      "dNameTable.QualifiedName.Kind:\007PACKAGE\")" +
+      "\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\022\t\n\005LOCAL\020" +
+      "\002\"\373\005\n\nAnnotation\022\020\n\002id\030\001 \002(\005B\004\220\265\030\001\022I\n\010ar" +
+      "gument\030\002 \003(\01327.org.jetbrains.kotlin.seri" +
+      "alization.Annotation.Argument\032\217\005\n\010Argume" +
+      "nt\022\025\n\007name_id\030\001 \002(\005B\004\210\265\030\001\022L\n\005value\030\002 \002(\013" +
+      "2=.org.jetbrains.kotlin.serialization.An" +
+      "notation.Argument.Value\032\235\004\n\005Value\022P\n\004typ" +
+      "e\030\001 \001(\0162B.org.jetbrains.kotlin.serializa" +
+      "tion.Annotation.Argument.Value.Type\022\021\n\ti",
+      "nt_value\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014d" +
+      "ouble_value\030\004 \001(\001\022\032\n\014string_value\030\005 \001(\005B" +
+      "\004\230\265\030\001\022\026\n\010class_id\030\006 \001(\005B\004\220\265\030\001\022\033\n\renum_va" +
+      "lue_id\030\007 \001(\005B\004\210\265\030\001\022B\n\nannotation\030\010 \001(\0132." +
+      ".org.jetbrains.kotlin.serialization.Anno" +
+      "tation\022T\n\rarray_element\030\t \003(\0132=.org.jetb" +
       "rains.kotlin.serialization.Annotation.Ar" +
-      "gument\032\217\005\n\010Argument\022\025\n\007name_id\030\001 \002(\005B\004\210\265" +
-      "\030\001\022L\n\005value\030\002 \002(\0132=.org.jetbrains.kotlin" +
-      ".serialization.Annotation.Argument.Value" +
-      "\032\235\004\n\005Value\022P\n\004type\030\001 \001(\0162B.org.jetbrains" +
-      ".kotlin.serialization.Annotation.Argumen",
-      "t.Value.Type\022\021\n\tint_value\030\002 \001(\022\022\023\n\013float" +
-      "_value\030\003 \001(\002\022\024\n\014double_value\030\004 \001(\001\022\032\n\014st" +
-      "ring_value\030\005 \001(\005B\004\230\265\030\001\022\026\n\010class_id\030\006 \001(\005" +
-      "B\004\220\265\030\001\022\033\n\renum_value_id\030\007 \001(\005B\004\210\265\030\001\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\"\231\006\n\004Type\022C\n\010arg" +
-      "ument\030\002 \003(\01321.org.jetbrains.kotlin.seria" +
-      "lization.Type.Argument\022\027\n\010nullable\030\003 \001(\010" +
-      ":\005false\022+\n\035flexible_type_capabilities_id" +
-      "\030\004 \001(\005B\004\230\265\030\001\022F\n\024flexible_upper_bound\030\005 \001" +
-      "(\0132(.org.jetbrains.kotlin.serialization." +
-      "Type\022\037\n\027flexible_upper_bound_id\030\010 \001(\005\022\030\n" +
-      "\nclass_name\030\006 \001(\005B\004\220\265\030\001\022\026\n\016type_paramete" +
-      "r\030\007 \001(\005\022!\n\023type_parameter_name\030\t \001(\005B\004\210\265",
-      "\030\001\022\035\n\017type_alias_name\030\014 \001(\005B\004\220\265\030\001\022<\n\nout" +
-      "er_type\030\n \001(\0132(.org.jetbrains.kotlin.ser" +
-      "ialization.Type\022\025\n\router_type_id\030\013 \001(\005\022B" +
-      "\n\020abbreviated_type\030\r \001(\0132(.org.jetbrains" +
-      ".kotlin.serialization.Type\022\033\n\023abbreviate" +
-      "d_type_id\030\016 \001(\005\022\r\n\005flags\030\001 \001(\005\032\334\001\n\010Argum" +
-      "ent\022U\n\nprojection\030\001 \001(\0162<.org.jetbrains." +
-      "kotlin.serialization.Type.Argument.Proje" +
-      "ction:\003INV\0226\n\004type\030\002 \001(\0132(.org.jetbrains" +
-      ".kotlin.serialization.Type\022\017\n\007type_id\030\003 ",
-      "\001(\005\"0\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" +
-      "V\020\002\022\010\n\004STAR\020\003*\005\010d\020\310\001\"\236\002\n\rTypeParameter\022\n" +
-      "\n\002id\030\001 \002(\005\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\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(" +
+      "gument.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\007BOOLEAN\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\005" +
+      "ARRAY\020\014\"\231\006\n\004Type\022C\n\010argument\030\002 \003(\01321.org" +
+      ".jetbrains.kotlin.serialization.Type.Arg" +
+      "ument\022\027\n\010nullable\030\003 \001(\010:\005false\022+\n\035flexib" +
+      "le_type_capabilities_id\030\004 \001(\005B\004\230\265\030\001\022F\n\024f" +
+      "lexible_upper_bound\030\005 \001(\0132(.org.jetbrain" +
+      "s.kotlin.serialization.Type\022\037\n\027flexible_" +
+      "upper_bound_id\030\010 \001(\005\022\030\n\nclass_name\030\006 \001(\005" +
+      "B\004\220\265\030\001\022\026\n\016type_parameter\030\007 \001(\005\022!\n\023type_p" +
+      "arameter_name\030\t \001(\005B\004\210\265\030\001\022\035\n\017type_alias_",
+      "name\030\014 \001(\005B\004\220\265\030\001\022<\n\nouter_type\030\n \001(\0132(.o" +
+      "rg.jetbrains.kotlin.serialization.Type\022\025" +
+      "\n\router_type_id\030\013 \001(\005\022B\n\020abbreviated_typ" +
+      "e\030\r \001(\0132(.org.jetbrains.kotlin.serializa" +
+      "tion.Type\022\033\n\023abbreviated_type_id\030\016 \001(\005\022\r" +
+      "\n\005flags\030\001 \001(\005\032\334\001\n\010Argument\022U\n\nprojection" +
+      "\030\001 \001(\0162<.org.jetbrains.kotlin.serializat" +
+      "ion.Type.Argument.Projection:\003INV\0226\n\004typ" +
+      "e\030\002 \001(\0132(.org.jetbrains.kotlin.serializa" +
+      "tion.Type\022\017\n\007type_id\030\003 \001(\005\"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*\005\010d" +
+      "\020\310\001\"\236\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\022\n\004nam" +
+      "e\030\002 \002(\005B\004\210\265\030\001\022\026\n\007reified\030\003 \001(\010:\005false\022Q\n" +
+      "\010variance\030\004 \001(\0162:.org.jetbrains.kotlin.s" +
+      "erialization.TypeParameter.Variance:\003INV" +
+      "\022=\n\013upper_bound\030\005 \003(\0132(.org.jetbrains.ko" +
+      "tlin.serialization.Type\022\026\n\016upper_bound_i" +
+      "d\030\006 \003(\005\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003" +
+      "INV\020\002*\005\010d\020\350\007\"\321\007\n\005Class\022\020\n\005flags\030\001 \001(\005:\0016" +
+      "\022\025\n\007fq_name\030\003 \002(\005B\004\220\265\030\001\022#\n\025companion_obj",
+      "ect_name\030\004 \001(\005B\004\210\265\030\001\022I\n\016type_parameter\030\005" +
+      " \003(\01321.org.jetbrains.kotlin.serializatio" +
+      "n.TypeParameter\022;\n\tsupertype\030\006 \003(\0132(.org" +
+      ".jetbrains.kotlin.serialization.Type\022\030\n\014" +
+      "supertype_id\030\002 \003(\005B\002\020\001\022!\n\021nested_class_n" +
+      "ame\030\007 \003(\005B\006\020\001\210\265\030\001\022D\n\013constructor\030\010 \003(\0132/" +
+      ".org.jetbrains.kotlin.serialization.Cons" +
+      "tructor\022>\n\010function\030\t \003(\0132,.org.jetbrain" +
+      "s.kotlin.serialization.Function\022>\n\010prope" +
+      "rty\030\n \003(\0132,.org.jetbrains.kotlin.seriali",
+      "zation.Property\022A\n\ntype_alias\030\013 \003(\0132-.or" +
+      "g.jetbrains.kotlin.serialization.TypeAli" +
+      "as\022A\n\nenum_entry\030\r \003(\0132-.org.jetbrains.k" +
+      "otlin.serialization.EnumEntry\022\'\n\027sealed_" +
+      "subclass_fq_name\030\020 \003(\005B\006\020\001\220\265\030\001\022A\n\ntype_t" +
+      "able\030\036 \001(\0132-.org.jetbrains.kotlin.serial" +
+      "ization.TypeTable\022\033\n\023version_requirement" +
+      "\030\037 \001(\005\022^\n\031version_requirement_table\030  \001(" +
+      "\0132;.org.jetbrains.kotlin.serialization.V" +
+      "ersionRequirementTable\"x\n\004Kind\022\t\n\005CLASS\020",
+      "\000\022\r\n\tINTERFACE\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM" +
+      "_ENTRY\020\003\022\024\n\020ANNOTATION_CLASS\020\004\022\n\n\006OBJECT" +
+      "\020\005\022\024\n\020COMPANION_OBJECT\020\006*\006\010d\020\270\224\001\"\366\002\n\007Pac" +
+      "kage\022>\n\010function\030\003 \003(\0132,.org.jetbrains.k" +
+      "otlin.serialization.Function\022>\n\010property" +
+      "\030\004 \003(\0132,.org.jetbrains.kotlin.serializat" +
+      "ion.Property\022A\n\ntype_alias\030\005 \003(\0132-.org.j" +
+      "etbrains.kotlin.serialization.TypeAlias\022" +
+      "A\n\ntype_table\030\036 \001(\0132-.org.jetbrains.kotl" +
+      "in.serialization.TypeTable\022^\n\031version_re",
+      "quirement_table\030  \001(\0132;.org.jetbrains.ko" +
+      "tlin.serialization.VersionRequirementTab" +
+      "le*\005\010d\020\310\001\"_\n\tTypeTable\0226\n\004type\030\001 \003(\0132(.o" +
+      "rg.jetbrains.kotlin.serialization.Type\022\032" +
+      "\n\016first_nullable\030\002 \001(\005:\002-1\"\221\001\n\013Construct" +
+      "or\022\020\n\005flags\030\001 \001(\005:\0016\022K\n\017value_parameter\030" +
+      "\002 \003(\01322.org.jetbrains.kotlin.serializati" +
+      "on.ValueParameter\022\033\n\023version_requirement" +
+      "\030\037 \001(\005*\006\010d\020\270\224\001\"\270\004\n\010Function\022\020\n\005flags\030\t \001" +
+      "(\005:\0016\022\024\n\told_flags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(",
+      "\005B\004\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.org.jetbr" +
+      "ains.kotlin.serialization.Type\022\026\n\016return" +
+      "_type_id\030\007 \001(\005\022I\n\016type_parameter\030\004 \003(\01321" +
       ".org.jetbrains.kotlin.serialization.Type" +
-      "\022\026\n\016upper_bound_id\030\006 \003(\005\"$\n\010Variance\022\006\n\002" +
-      "IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002*\005\010d\020\350\007\"\321\007\n\005Class\022" +
-      "\020\n\005flags\030\001 \001(\005:\0016\022\025\n\007fq_name\030\003 \002(\005B\004\220\265\030\001",
-      "\022#\n\025companion_object_name\030\004 \001(\005B\004\210\265\030\001\022I\n" +
-      "\016type_parameter\030\005 \003(\01321.org.jetbrains.ko" +
-      "tlin.serialization.TypeParameter\022;\n\tsupe" +
-      "rtype\030\006 \003(\0132(.org.jetbrains.kotlin.seria" +
-      "lization.Type\022\030\n\014supertype_id\030\002 \003(\005B\002\020\001\022" +
-      "!\n\021nested_class_name\030\007 \003(\005B\006\020\001\210\265\030\001\022D\n\013co" +
-      "nstructor\030\010 \003(\0132/.org.jetbrains.kotlin.s" +
-      "erialization.Constructor\022>\n\010function\030\t \003" +
-      "(\0132,.org.jetbrains.kotlin.serialization." +
-      "Function\022>\n\010property\030\n \003(\0132,.org.jetbrai",
-      "ns.kotlin.serialization.Property\022A\n\ntype" +
-      "_alias\030\013 \003(\0132-.org.jetbrains.kotlin.seri" +
-      "alization.TypeAlias\022A\n\nenum_entry\030\r \003(\0132" +
-      "-.org.jetbrains.kotlin.serialization.Enu" +
-      "mEntry\022\'\n\027sealed_subclass_fq_name\030\020 \003(\005B" +
-      "\006\020\001\220\265\030\001\022A\n\ntype_table\030\036 \001(\0132-.org.jetbra" +
-      "ins.kotlin.serialization.TypeTable\022\033\n\023ve" +
-      "rsion_requirement\030\037 \001(\005\022^\n\031version_requi" +
-      "rement_table\030  \001(\0132;.org.jetbrains.kotli" +
-      "n.serialization.VersionRequirementTable\"",
-      "x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTERFACE\020\001\022\016\n\nENU" +
-      "M_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_" +
-      "CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPANION_OBJECT\020" +
-      "\006*\006\010d\020\270\224\001\"\366\002\n\007Package\022>\n\010function\030\003 \003(\0132" +
-      ",.org.jetbrains.kotlin.serialization.Fun" +
-      "ction\022>\n\010property\030\004 \003(\0132,.org.jetbrains." +
-      "kotlin.serialization.Property\022A\n\ntype_al" +
-      "ias\030\005 \003(\0132-.org.jetbrains.kotlin.seriali" +
-      "zation.TypeAlias\022A\n\ntype_table\030\036 \001(\0132-.o" +
-      "rg.jetbrains.kotlin.serialization.TypeTa",
-      "ble\022^\n\031version_requirement_table\030  \001(\0132;" +
-      ".org.jetbrains.kotlin.serialization.Vers" +
-      "ionRequirementTable*\005\010d\020\310\001\"_\n\tTypeTable\022" +
-      "6\n\004type\030\001 \003(\0132(.org.jetbrains.kotlin.ser" +
-      "ialization.Type\022\032\n\016first_nullable\030\002 \001(\005:" +
-      "\002-1\"\221\001\n\013Constructor\022\020\n\005flags\030\001 \001(\005:\0016\022K\n" +
-      "\017value_parameter\030\002 \003(\01322.org.jetbrains.k" +
-      "otlin.serialization.ValueParameter\022\033\n\023ve" +
-      "rsion_requirement\030\037 \001(\005*\006\010d\020\270\224\001\"\270\004\n\010Func" +
-      "tion\022\020\n\005flags\030\t \001(\005:\0016\022\024\n\told_flags\030\001 \001(",
-      "\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030" +
-      "\003 \001(\0132(.org.jetbrains.kotlin.serializati" +
-      "on.Type\022\026\n\016return_type_id\030\007 \001(\005\022I\n\016type_" +
-      "parameter\030\004 \003(\01321.org.jetbrains.kotlin.s" +
-      "erialization.TypeParameter\022?\n\rreceiver_t" +
-      "ype\030\005 \001(\0132(.org.jetbrains.kotlin.seriali" +
-      "zation.Type\022\030\n\020receiver_type_id\030\010 \001(\005\022K\n" +
-      "\017value_parameter\030\006 \003(\01322.org.jetbrains.k" +
-      "otlin.serialization.ValueParameter\022A\n\nty" +
-      "pe_table\030\036 \001(\0132-.org.jetbrains.kotlin.se",
-      "rialization.TypeTable\022\033\n\023version_require" +
-      "ment\030\037 \001(\005\022>\n\010contract\030  \001(\0132,.org.jetbr" +
-      "ains.kotlin.serialization.Contract*\006\010d\020\270" +
-      "\224\001\"\355\003\n\010Property\022\022\n\005flags\030\013 \001(\005:\003518\022\027\n\to" +
-      "ld_flags\030\001 \001(\005:\0042054\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001" +
-      "\022=\n\013return_type\030\003 \001(\0132(.org.jetbrains.ko" +
-      "tlin.serialization.Type\022\026\n\016return_type_i" +
-      "d\030\t \001(\005\022I\n\016type_parameter\030\004 \003(\01321.org.je" +
-      "tbrains.kotlin.serialization.TypeParamet" +
-      "er\022?\n\rreceiver_type\030\005 \001(\0132(.org.jetbrain",
-      "s.kotlin.serialization.Type\022\030\n\020receiver_" +
-      "type_id\030\n \001(\005\022R\n\026setter_value_parameter\030" +
-      "\006 \001(\01322.org.jetbrains.kotlin.serializati" +
-      "on.ValueParameter\022\024\n\014getter_flags\030\007 \001(\005\022" +
-      "\024\n\014setter_flags\030\010 \001(\005\022\033\n\023version_require" +
-      "ment\030\037 \001(\005*\006\010d\020\270\224\001\"\355\001\n\016ValueParameter\022\020\n" +
-      "\005flags\030\001 \001(\005:\0010\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0226\n\004t" +
-      "ype\030\003 \001(\0132(.org.jetbrains.kotlin.seriali" +
-      "zation.Type\022\017\n\007type_id\030\005 \001(\005\022E\n\023vararg_e" +
-      "lement_type\030\004 \001(\0132(.org.jetbrains.kotlin",
-      ".serialization.Type\022\036\n\026vararg_element_ty" +
-      "pe_id\030\006 \001(\005*\005\010d\020\310\001\"\236\003\n\tTypeAlias\022\020\n\005flag" +
-      "s\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022I\n\016type_p" +
-      "arameter\030\003 \003(\01321.org.jetbrains.kotlin.se" +
-      "rialization.TypeParameter\022A\n\017underlying_" +
-      "type\030\004 \001(\0132(.org.jetbrains.kotlin.serial" +
-      "ization.Type\022\032\n\022underlying_type_id\030\005 \001(\005" +
-      "\022?\n\rexpanded_type\030\006 \001(\0132(.org.jetbrains." +
-      "kotlin.serialization.Type\022\030\n\020expanded_ty" +
-      "pe_id\030\007 \001(\005\022B\n\nannotation\030\010 \003(\0132..org.je",
-      "tbrains.kotlin.serialization.Annotation\022" +
-      "\033\n\023version_requirement\030\037 \001(\005*\005\010d\020\310\001\"&\n\tE" +
-      "numEntry\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001\"\237\003\n\022" +
-      "VersionRequirement\022\017\n\007version\030\001 \001(\005\022\024\n\014v" +
-      "ersion_full\030\002 \001(\005\022R\n\005level\030\003 \001(\0162<.org.j" +
-      "etbrains.kotlin.serialization.VersionReq" +
-      "uirement.Level:\005ERROR\022\022\n\nerror_code\030\004 \001(" +
-      "\005\022\025\n\007message\030\005 \001(\005B\004\230\265\030\001\022j\n\014version_kind" +
-      "\030\006 \001(\0162B.org.jetbrains.kotlin.serializat" +
-      "ion.VersionRequirement.VersionKind:\020LANG",
-      "UAGE_VERSION\"+\n\005Level\022\013\n\007WARNING\020\000\022\t\n\005ER" +
-      "ROR\020\001\022\n\n\006HIDDEN\020\002\"J\n\013VersionKind\022\024\n\020LANG" +
-      "UAGE_VERSION\020\000\022\024\n\020COMPILER_VERSION\020\001\022\017\n\013" +
-      "API_VERSION\020\002\"f\n\027VersionRequirementTable" +
-      "\022K\n\013requirement\030\001 \003(\01326.org.jetbrains.ko" +
-      "tlin.serialization.VersionRequirement\"\243\002" +
-      "\n\017PackageFragment\022@\n\007strings\030\001 \001(\0132/.org" +
-      ".jetbrains.kotlin.serialization.StringTa" +
-      "ble\022O\n\017qualified_names\030\002 \001(\01326.org.jetbr" +
-      "ains.kotlin.serialization.QualifiedNameT",
-      "able\022<\n\007package\030\003 \001(\0132+.org.jetbrains.ko" +
-      "tlin.serialization.Package\0228\n\005class\030\004 \003(" +
-      "\0132).org.jetbrains.kotlin.serialization.C" +
-      "lass*\005\010d\020\310\001\"F\n\010Contract\022:\n\006effect\030\001 \003(\0132" +
-      "*.org.jetbrains.kotlin.serialization.Eff" +
-      "ect\"\332\003\n\006Effect\022J\n\013effect_type\030\001 \001(\01625.or" +
-      "g.jetbrains.kotlin.serialization.Effect." +
-      "EffectType\022S\n\033effect_constructor_argumen" +
-      "t\030\002 \003(\0132..org.jetbrains.kotlin.serializa" +
-      "tion.Expression\022X\n conclusion_of_conditi",
-      "onal_effect\030\003 \001(\0132..org.jetbrains.kotlin" +
-      ".serialization.Expression\022G\n\004kind\030\004 \001(\0162" +
-      "9.org.jetbrains.kotlin.serialization.Eff" +
-      "ect.InvocationKind\"C\n\nEffectType\022\024\n\020RETU" +
-      "RNS_CONSTANT\020\000\022\t\n\005CALLS\020\001\022\024\n\020RETURNS_NOT" +
-      "_NULL\020\002\"G\n\016InvocationKind\022\020\n\014AT_MOST_ONC" +
-      "E\020\000\022\020\n\014EXACTLY_ONCE\020\001\022\021\n\rAT_LEAST_ONCE\020\002" +
-      "\"\260\003\n\nExpression\022\r\n\005flags\030\001 \001(\005\022!\n\031value_" +
-      "parameter_reference\030\002 \001(\005\022T\n\016constant_va" +
-      "lue\030\003 \001(\0162<.org.jetbrains.kotlin.seriali",
-      "zation.Expression.ConstantValue\022B\n\020is_in" +
-      "stance_type\030\004 \001(\0132(.org.jetbrains.kotlin" +
-      ".serialization.Type\022\033\n\023is_instance_type_" +
-      "id\030\005 \001(\005\022D\n\014and_argument\030\006 \003(\0132..org.jet" +
-      "brains.kotlin.serialization.Expression\022C" +
-      "\n\013or_argument\030\007 \003(\0132..org.jetbrains.kotl" +
-      "in.serialization.Expression\".\n\rConstantV" +
-      "alue\022\010\n\004TRUE\020\000\022\t\n\005FALSE\020\001\022\010\n\004NULL\020\002*9\n\010M" +
-      "odality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT" +
-      "\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNAL",
-      "\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC" +
-      "\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMe" +
-      "mberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRI" +
-      "DE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\017B" +
-      "\rDebugProtoBuf"
+      "Parameter\022?\n\rreceiver_type\030\005 \001(\0132(.org.j" +
+      "etbrains.kotlin.serialization.Type\022\030\n\020re" +
+      "ceiver_type_id\030\010 \001(\005\022K\n\017value_parameter\030" +
+      "\006 \003(\01322.org.jetbrains.kotlin.serializati" +
+      "on.ValueParameter\022A\n\ntype_table\030\036 \001(\0132-." +
+      "org.jetbrains.kotlin.serialization.TypeT",
+      "able\022\033\n\023version_requirement\030\037 \001(\005\022>\n\010con" +
+      "tract\030  \001(\0132,.org.jetbrains.kotlin.seria" +
+      "lization.Contract*\006\010d\020\270\224\001\"\355\003\n\010Property\022\022" +
+      "\n\005flags\030\013 \001(\005:\003518\022\027\n\told_flags\030\001 \001(\005:\0042" +
+      "054\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003" +
+      " \001(\0132(.org.jetbrains.kotlin.serializatio" +
+      "n.Type\022\026\n\016return_type_id\030\t \001(\005\022I\n\016type_p" +
+      "arameter\030\004 \003(\01321.org.jetbrains.kotlin.se" +
+      "rialization.TypeParameter\022?\n\rreceiver_ty" +
+      "pe\030\005 \001(\0132(.org.jetbrains.kotlin.serializ",
+      "ation.Type\022\030\n\020receiver_type_id\030\n \001(\005\022R\n\026" +
+      "setter_value_parameter\030\006 \001(\01322.org.jetbr" +
+      "ains.kotlin.serialization.ValueParameter" +
+      "\022\024\n\014getter_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010" +
+      " \001(\005\022\033\n\023version_requirement\030\037 \001(\005*\006\010d\020\270\224" +
+      "\001\"\355\001\n\016ValueParameter\022\020\n\005flags\030\001 \001(\005:\0010\022\022" +
+      "\n\004name\030\002 \002(\005B\004\210\265\030\001\0226\n\004type\030\003 \001(\0132(.org.j" +
+      "etbrains.kotlin.serialization.Type\022\017\n\007ty" +
+      "pe_id\030\005 \001(\005\022E\n\023vararg_element_type\030\004 \001(\013" +
+      "2(.org.jetbrains.kotlin.serialization.Ty",
+      "pe\022\036\n\026vararg_element_type_id\030\006 \001(\005*\005\010d\020\310" +
+      "\001\"\236\003\n\tTypeAlias\022\020\n\005flags\030\001 \001(\005:\0016\022\022\n\004nam" +
+      "e\030\002 \002(\005B\004\210\265\030\001\022I\n\016type_parameter\030\003 \003(\01321." +
+      "org.jetbrains.kotlin.serialization.TypeP" +
+      "arameter\022A\n\017underlying_type\030\004 \001(\0132(.org." +
+      "jetbrains.kotlin.serialization.Type\022\032\n\022u" +
+      "nderlying_type_id\030\005 \001(\005\022?\n\rexpanded_type" +
+      "\030\006 \001(\0132(.org.jetbrains.kotlin.serializat" +
+      "ion.Type\022\030\n\020expanded_type_id\030\007 \001(\005\022B\n\nan" +
+      "notation\030\010 \003(\0132..org.jetbrains.kotlin.se",
+      "rialization.Annotation\022\033\n\023version_requir" +
+      "ement\030\037 \001(\005*\005\010d\020\310\001\"&\n\tEnumEntry\022\022\n\004name\030" +
+      "\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001\"\237\003\n\022VersionRequiremen" +
+      "t\022\017\n\007version\030\001 \001(\005\022\024\n\014version_full\030\002 \001(\005" +
+      "\022R\n\005level\030\003 \001(\0162<.org.jetbrains.kotlin.s" +
+      "erialization.VersionRequirement.Level:\005E" +
+      "RROR\022\022\n\nerror_code\030\004 \001(\005\022\025\n\007message\030\005 \001(" +
+      "\005B\004\230\265\030\001\022j\n\014version_kind\030\006 \001(\0162B.org.jetb" +
+      "rains.kotlin.serialization.VersionRequir" +
+      "ement.VersionKind:\020LANGUAGE_VERSION\"+\n\005L",
+      "evel\022\013\n\007WARNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HIDDEN\020\002" +
+      "\"J\n\013VersionKind\022\024\n\020LANGUAGE_VERSION\020\000\022\024\n" +
+      "\020COMPILER_VERSION\020\001\022\017\n\013API_VERSION\020\002\"f\n\027" +
+      "VersionRequirementTable\022K\n\013requirement\030\001" +
+      " \003(\01326.org.jetbrains.kotlin.serializatio" +
+      "n.VersionRequirement\"\243\002\n\017PackageFragment" +
+      "\022@\n\007strings\030\001 \001(\0132/.org.jetbrains.kotlin" +
+      ".serialization.StringTable\022O\n\017qualified_" +
+      "names\030\002 \001(\01326.org.jetbrains.kotlin.seria" +
+      "lization.QualifiedNameTable\022<\n\007package\030\003",
+      " \001(\0132+.org.jetbrains.kotlin.serializatio" +
+      "n.Package\0228\n\005class\030\004 \003(\0132).org.jetbrains" +
+      ".kotlin.serialization.Class*\005\010d\020\310\001\"F\n\010Co" +
+      "ntract\022:\n\006effect\030\001 \003(\0132*.org.jetbrains.k" +
+      "otlin.serialization.Effect\"\332\003\n\006Effect\022J\n" +
+      "\013effect_type\030\001 \001(\01625.org.jetbrains.kotli" +
+      "n.serialization.Effect.EffectType\022S\n\033eff" +
+      "ect_constructor_argument\030\002 \003(\0132..org.jet" +
+      "brains.kotlin.serialization.Expression\022X" +
+      "\n conclusion_of_conditional_effect\030\003 \001(\013",
+      "2..org.jetbrains.kotlin.serialization.Ex" +
+      "pression\022G\n\004kind\030\004 \001(\01629.org.jetbrains.k" +
+      "otlin.serialization.Effect.InvocationKin" +
+      "d\"C\n\nEffectType\022\024\n\020RETURNS_CONSTANT\020\000\022\t\n" +
+      "\005CALLS\020\001\022\024\n\020RETURNS_NOT_NULL\020\002\"G\n\016Invoca" +
+      "tionKind\022\020\n\014AT_MOST_ONCE\020\000\022\020\n\014EXACTLY_ON" +
+      "CE\020\001\022\021\n\rAT_LEAST_ONCE\020\002\"\260\003\n\nExpression\022\r" +
+      "\n\005flags\030\001 \001(\005\022!\n\031value_parameter_referen" +
+      "ce\030\002 \001(\005\022T\n\016constant_value\030\003 \001(\0162<.org.j" +
+      "etbrains.kotlin.serialization.Expression",
+      ".ConstantValue\022B\n\020is_instance_type\030\004 \001(\013" +
+      "2(.org.jetbrains.kotlin.serialization.Ty" +
+      "pe\022\033\n\023is_instance_type_id\030\005 \001(\005\022D\n\014and_a" +
+      "rgument\030\006 \003(\0132..org.jetbrains.kotlin.ser" +
+      "ialization.Expression\022C\n\013or_argument\030\007 \003" +
+      "(\0132..org.jetbrains.kotlin.serialization." +
+      "Expression\".\n\rConstantValue\022\010\n\004TRUE\020\000\022\t\n" +
+      "\005FALSE\020\001\022\010\n\004NULL\020\002*9\n\010Modality\022\t\n\005FINAL\020" +
+      "\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006SEALED\020\003*b\n" +
+      "\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r",
+      "\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_" +
+      "THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberKind\022\017\n\013DECLA" +
+      "RATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATIO" +
+      "N\020\002\022\017\n\013SYNTHESIZED\020\003B\017B\rDebugProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
index fa46ac16a72..a9524480b20 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/deserialization/src/builtins.debug.proto
+// source: core/metadata/src/builtins.debug.proto
 
 package org.jetbrains.kotlin.serialization.builtins;
 
@@ -137,41 +137,41 @@ public final class DebugBuiltInsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n-core/deserialization/src/builtins.debu" +
-      "g.proto\022+org.jetbrains.kotlin.serializat" +
-      "ion.builtins\0320core/deserialization/src/d" +
-      "escriptors.debug.proto:E\n\017package_fq_nam" +
-      "e\022+.org.jetbrains.kotlin.serialization.P" +
-      "ackage\030\227\001 \001(\005:t\n\020class_annotation\022).org." +
-      "jetbrains.kotlin.serialization.Class\030\226\001 " +
+      "\n&core/metadata/src/builtins.debug.proto" +
+      "\022+org.jetbrains.kotlin.serialization.bui" +
+      "ltins\032&core/metadata/src/metadata.debug." +
+      "proto:E\n\017package_fq_name\022+.org.jetbrains" +
+      ".kotlin.serialization.Package\030\227\001 \001(\005:t\n\020" +
+      "class_annotation\022).org.jetbrains.kotlin." +
+      "serialization.Class\030\226\001 \003(\0132..org.jetbrai" +
+      "ns.kotlin.serialization.Annotation:\200\001\n\026c" +
+      "onstructor_annotation\022/.org.jetbrains.ko" +
+      "tlin.serialization.Constructor\030\226\001 \003(\0132..",
+      "org.jetbrains.kotlin.serialization.Annot" +
+      "ation:z\n\023function_annotation\022,.org.jetbr" +
+      "ains.kotlin.serialization.Function\030\226\001 \003(" +
+      "\0132..org.jetbrains.kotlin.serialization.A" +
+      "nnotation:z\n\023property_annotation\022,.org.j" +
+      "etbrains.kotlin.serialization.Property\030\226" +
+      "\001 \003(\0132..org.jetbrains.kotlin.serializati" +
+      "on.Annotation:\210\001\n\022compile_time_value\022,.o" +
+      "rg.jetbrains.kotlin.serialization.Proper" +
+      "ty\030\227\001 \001(\0132=.org.jetbrains.kotlin.seriali",
+      "zation.Annotation.Argument.Value:}\n\025enum" +
+      "_entry_annotation\022-.org.jetbrains.kotlin" +
+      ".serialization.EnumEntry\030\226\001 \003(\0132..org.je" +
+      "tbrains.kotlin.serialization.Annotation:" +
+      "\201\001\n\024parameter_annotation\0222.org.jetbrains" +
+      ".kotlin.serialization.ValueParameter\030\226\001 " +
       "\003(\0132..org.jetbrains.kotlin.serialization" +
-      ".Annotation:\200\001\n\026constructor_annotation\022/" +
-      ".org.jetbrains.kotlin.serialization.Cons",
-      "tructor\030\226\001 \003(\0132..org.jetbrains.kotlin.se" +
-      "rialization.Annotation:z\n\023function_annot" +
-      "ation\022,.org.jetbrains.kotlin.serializati" +
-      "on.Function\030\226\001 \003(\0132..org.jetbrains.kotli" +
-      "n.serialization.Annotation:z\n\023property_a" +
-      "nnotation\022,.org.jetbrains.kotlin.seriali" +
-      "zation.Property\030\226\001 \003(\0132..org.jetbrains.k" +
-      "otlin.serialization.Annotation:\210\001\n\022compi" +
-      "le_time_value\022,.org.jetbrains.kotlin.ser" +
-      "ialization.Property\030\227\001 \001(\0132=.org.jetbrai",
-      "ns.kotlin.serialization.Annotation.Argum" +
-      "ent.Value:}\n\025enum_entry_annotation\022-.org" +
-      ".jetbrains.kotlin.serialization.EnumEntr" +
-      "y\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" +
-      "ation.Annotation:\201\001\n\024parameter_annotatio" +
-      "n\0222.org.jetbrains.kotlin.serialization.V" +
-      "alueParameter\030\226\001 \003(\0132..org.jetbrains.kot" +
-      "lin.serialization.Annotation:r\n\017type_ann" +
-      "otation\022(.org.jetbrains.kotlin.serializa" +
-      "tion.Type\030\226\001 \003(\0132..org.jetbrains.kotlin.",
-      "serialization.Annotation:\205\001\n\031type_parame" +
-      "ter_annotation\0221.org.jetbrains.kotlin.se" +
-      "rialization.TypeParameter\030\226\001 \003(\0132..org.j" +
-      "etbrains.kotlin.serialization.Annotation" +
-      "B\027B\025DebugBuiltInsProtoBuf"
+      ".Annotation:r\n\017type_annotation\022(.org.jet" +
+      "brains.kotlin.serialization.Type\030\226\001 \003(\0132" +
+      "..org.jetbrains.kotlin.serialization.Ann",
+      "otation:\205\001\n\031type_parameter_annotation\0221." +
+      "org.jetbrains.kotlin.serialization.TypeP" +
+      "arameter\030\226\001 \003(\0132..org.jetbrains.kotlin.s" +
+      "erialization.AnnotationB\027B\025DebugBuiltIns" +
+      "ProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java
index 47a346b4802..cc2b2ffbf72 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java
@@ -91,20 +91,20 @@ public final class DebugJavaClassProtoBuf {
     java.lang.String[] descriptorData = {
       "\n-build-common/src/java_descriptors.debu" +
       "g.proto\022\'org.jetbrains.kotlin.serializat" +
-      "ion.java\0320core/deserialization/src/descr" +
-      "iptors.debug.proto:G\n\020is_static_method\022," +
-      ".org.jetbrains.kotlin.serialization.Func" +
-      "tion\030\350\007 \001(\010:P\n\031is_package_private_method" +
-      "\022,.org.jetbrains.kotlin.serialization.Fu" +
-      "nction\030\351\007 \001(\010:F\n\017is_static_field\022,.org.j" +
-      "etbrains.kotlin.serialization.Property\030\350" +
-      "\007 \001(\010:O\n\030is_package_private_field\022,.org.",
-      "jetbrains.kotlin.serialization.Property\030" +
-      "\351\007 \001(\010:L\n\030is_package_private_class\022).org" +
-      ".jetbrains.kotlin.serialization.Class\030\350\007" +
-      " \001(\010:X\n\036is_package_private_constructor\022/" +
-      ".org.jetbrains.kotlin.serialization.Cons" +
-      "tructor\030\350\007 \001(\010B\030B\026DebugJavaClassProtoBuf"
+      "ion.java\032&core/metadata/src/metadata.deb" +
+      "ug.proto:G\n\020is_static_method\022,.org.jetbr" +
+      "ains.kotlin.serialization.Function\030\350\007 \001(" +
+      "\010:P\n\031is_package_private_method\022,.org.jet" +
+      "brains.kotlin.serialization.Function\030\351\007 " +
+      "\001(\010:F\n\017is_static_field\022,.org.jetbrains.k" +
+      "otlin.serialization.Property\030\350\007 \001(\010:O\n\030i" +
+      "s_package_private_field\022,.org.jetbrains.",
+      "kotlin.serialization.Property\030\351\007 \001(\010:L\n\030" +
+      "is_package_private_class\022).org.jetbrains" +
+      ".kotlin.serialization.Class\030\350\007 \001(\010:X\n\036is" +
+      "_package_private_constructor\022/.org.jetbr" +
+      "ains.kotlin.serialization.Constructor\030\350\007" +
+      " \001(\010B\030B\026DebugJavaClassProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
index 1a13dd857d8..1db08d40852 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
@@ -4864,67 +4864,67 @@ public final class DebugJsProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\n#js/js.serializer/src/js.debug.proto\022%o" +
-      "rg.jetbrains.kotlin.serialization.js\0320co" +
-      "re/deserialization/src/descriptors.debug" +
-      ".proto\"\252\002\n\006Header\022\r\n\005flags\030\001 \001(\005\022!\n\026js_c" +
-      "ode_binary_version\030\002 \001(\005:\0011\022\027\n\017package_f" +
-      "q_name\030\003 \001(\t\022@\n\007strings\030\004 \001(\0132/.org.jetb" +
-      "rains.kotlin.serialization.StringTable\022O" +
-      "\n\017qualified_names\030\005 \001(\01326.org.jetbrains." +
-      "kotlin.serialization.QualifiedNameTable\022" +
-      "B\n\nannotation\030\006 \003(\0132..org.jetbrains.kotl",
-      "in.serialization.Annotation\"V\n\004File\022\n\n\002i" +
-      "d\030\001 \001(\005\022B\n\nannotation\030\002 \003(\0132..org.jetbra" +
-      "ins.kotlin.serialization.Annotation\"B\n\005F" +
-      "iles\0229\n\004file\030\001 \003(\0132+.org.jetbrains.kotli" +
-      "n.serialization.js.File\"!\n\007Classes\022\026\n\ncl" +
-      "ass_name\030\001 \003(\005B\002\020\001\"\357\001\n\007Library\022H\n\004kind\030\001" +
-      " \001(\01623.org.jetbrains.kotlin.serializatio" +
-      "n.js.Library.Kind:\005PLAIN\022M\n\020package_frag" +
-      "ment\030\002 \003(\01323.org.jetbrains.kotlin.serial" +
-      "ization.PackageFragment\022\027\n\017imported_modu",
-      "le\030\003 \003(\t\"2\n\004Kind\022\t\n\005PLAIN\020\001\022\007\n\003AMD\020\002\022\r\n\t" +
-      "COMMON_JS\020\003\022\007\n\003UMD\020\004:E\n\017package_fq_name\022" +
-      "+.org.jetbrains.kotlin.serialization.Pac" +
-      "kage\030\203\001 \001(\005:t\n\020class_annotation\022).org.je" +
-      "tbrains.kotlin.serialization.Class\030\202\001 \003(" +
-      "\0132..org.jetbrains.kotlin.serialization.A" +
-      "nnotation:L\n\030class_containing_file_id\022)." +
-      "org.jetbrains.kotlin.serialization.Class" +
-      "\030\207\001 \001(\005:\200\001\n\026constructor_annotation\022/.org" +
-      ".jetbrains.kotlin.serialization.Construc",
-      "tor\030\202\001 \003(\0132..org.jetbrains.kotlin.serial" +
-      "ization.Annotation:z\n\023function_annotatio" +
-      "n\022,.org.jetbrains.kotlin.serialization.F" +
-      "unction\030\202\001 \003(\0132..org.jetbrains.kotlin.se" +
-      "rialization.Annotation:R\n\033function_conta" +
-      "ining_file_id\022,.org.jetbrains.kotlin.ser" +
-      "ialization.Function\030\207\001 \001(\005:z\n\023property_a" +
-      "nnotation\022,.org.jetbrains.kotlin.seriali" +
-      "zation.Property\030\202\001 \003(\0132..org.jetbrains.k" +
-      "otlin.serialization.Annotation:\210\001\n\022compi",
-      "le_time_value\022,.org.jetbrains.kotlin.ser" +
-      "ialization.Property\030\203\001 \001(\0132=.org.jetbrai" +
-      "ns.kotlin.serialization.Annotation.Argum" +
-      "ent.Value:R\n\033property_containing_file_id" +
-      "\022,.org.jetbrains.kotlin.serialization.Pr" +
-      "operty\030\207\001 \001(\005:}\n\025enum_entry_annotation\022-" +
-      ".org.jetbrains.kotlin.serialization.Enum" +
-      "Entry\030\202\001 \003(\0132..org.jetbrains.kotlin.seri" +
-      "alization.Annotation:\201\001\n\024parameter_annot" +
-      "ation\0222.org.jetbrains.kotlin.serializati",
-      "on.ValueParameter\030\202\001 \003(\0132..org.jetbrains" +
-      ".kotlin.serialization.Annotation:r\n\017type" +
-      "_annotation\022(.org.jetbrains.kotlin.seria" +
-      "lization.Type\030\202\001 \003(\0132..org.jetbrains.kot" +
-      "lin.serialization.Annotation:\205\001\n\031type_pa" +
-      "rameter_annotation\0221.org.jetbrains.kotli" +
-      "n.serialization.TypeParameter\030\202\001 \003(\0132..o" +
-      "rg.jetbrains.kotlin.serialization.Annota" +
-      "tion:\202\001\n\026package_fragment_files\0223.org.je" +
-      "tbrains.kotlin.serialization.PackageFrag",
-      "ment\030\202\001 \001(\0132,.org.jetbrains.kotlin.seria" +
-      "lization.js.FilesB\021B\017DebugJsProtoBuf"
+      "rg.jetbrains.kotlin.serialization.js\032&co" +
+      "re/metadata/src/metadata.debug.proto\"\252\002\n" +
+      "\006Header\022\r\n\005flags\030\001 \001(\005\022!\n\026js_code_binary" +
+      "_version\030\002 \001(\005:\0011\022\027\n\017package_fq_name\030\003 \001" +
+      "(\t\022@\n\007strings\030\004 \001(\0132/.org.jetbrains.kotl" +
+      "in.serialization.StringTable\022O\n\017qualifie" +
+      "d_names\030\005 \001(\01326.org.jetbrains.kotlin.ser" +
+      "ialization.QualifiedNameTable\022B\n\nannotat" +
+      "ion\030\006 \003(\0132..org.jetbrains.kotlin.seriali",
+      "zation.Annotation\"V\n\004File\022\n\n\002id\030\001 \001(\005\022B\n" +
+      "\nannotation\030\002 \003(\0132..org.jetbrains.kotlin" +
+      ".serialization.Annotation\"B\n\005Files\0229\n\004fi" +
+      "le\030\001 \003(\0132+.org.jetbrains.kotlin.serializ" +
+      "ation.js.File\"!\n\007Classes\022\026\n\nclass_name\030\001" +
+      " \003(\005B\002\020\001\"\357\001\n\007Library\022H\n\004kind\030\001 \001(\01623.org" +
+      ".jetbrains.kotlin.serialization.js.Libra" +
+      "ry.Kind:\005PLAIN\022M\n\020package_fragment\030\002 \003(\013" +
+      "23.org.jetbrains.kotlin.serialization.Pa" +
+      "ckageFragment\022\027\n\017imported_module\030\003 \003(\t\"2",
+      "\n\004Kind\022\t\n\005PLAIN\020\001\022\007\n\003AMD\020\002\022\r\n\tCOMMON_JS\020" +
+      "\003\022\007\n\003UMD\020\004:E\n\017package_fq_name\022+.org.jetb" +
+      "rains.kotlin.serialization.Package\030\203\001 \001(" +
+      "\005:t\n\020class_annotation\022).org.jetbrains.ko" +
+      "tlin.serialization.Class\030\202\001 \003(\0132..org.je" +
+      "tbrains.kotlin.serialization.Annotation:" +
+      "L\n\030class_containing_file_id\022).org.jetbra" +
+      "ins.kotlin.serialization.Class\030\207\001 \001(\005:\200\001" +
+      "\n\026constructor_annotation\022/.org.jetbrains" +
+      ".kotlin.serialization.Constructor\030\202\001 \003(\013",
+      "2..org.jetbrains.kotlin.serialization.An" +
+      "notation:z\n\023function_annotation\022,.org.je" +
+      "tbrains.kotlin.serialization.Function\030\202\001" +
+      " \003(\0132..org.jetbrains.kotlin.serializatio" +
+      "n.Annotation:R\n\033function_containing_file" +
+      "_id\022,.org.jetbrains.kotlin.serialization" +
+      ".Function\030\207\001 \001(\005:z\n\023property_annotation\022" +
+      ",.org.jetbrains.kotlin.serialization.Pro" +
+      "perty\030\202\001 \003(\0132..org.jetbrains.kotlin.seri" +
+      "alization.Annotation:\210\001\n\022compile_time_va",
+      "lue\022,.org.jetbrains.kotlin.serialization" +
+      ".Property\030\203\001 \001(\0132=.org.jetbrains.kotlin." +
+      "serialization.Annotation.Argument.Value:" +
+      "R\n\033property_containing_file_id\022,.org.jet" +
+      "brains.kotlin.serialization.Property\030\207\001 " +
+      "\001(\005:}\n\025enum_entry_annotation\022-.org.jetbr" +
+      "ains.kotlin.serialization.EnumEntry\030\202\001 \003" +
+      "(\0132..org.jetbrains.kotlin.serialization." +
+      "Annotation:\201\001\n\024parameter_annotation\0222.or" +
+      "g.jetbrains.kotlin.serialization.ValuePa",
+      "rameter\030\202\001 \003(\0132..org.jetbrains.kotlin.se" +
+      "rialization.Annotation:r\n\017type_annotatio" +
+      "n\022(.org.jetbrains.kotlin.serialization.T" +
+      "ype\030\202\001 \003(\0132..org.jetbrains.kotlin.serial" +
+      "ization.Annotation:\205\001\n\031type_parameter_an" +
+      "notation\0221.org.jetbrains.kotlin.serializ" +
+      "ation.TypeParameter\030\202\001 \003(\0132..org.jetbrai" +
+      "ns.kotlin.serialization.Annotation:\202\001\n\026p" +
+      "ackage_fragment_files\0223.org.jetbrains.ko" +
+      "tlin.serialization.PackageFragment\030\202\001 \001(",
+      "\0132,.org.jetbrains.kotlin.serialization.j" +
+      "s.FilesB\021B\017DebugJsProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
index 60381394b4d..8100460b32e 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_module.debug.proto
+// source: core/metadata.jvm/src/jvm_module.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
@@ -4256,27 +4256,27 @@ public final class DebugJvmModuleProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n/core/descriptors.jvm/src/jvm_module.de" +
-      "bug.proto\022&org.jetbrains.kotlin.serializ" +
-      "ation.jvm\0320core/deserialization/src/desc" +
-      "riptors.debug.proto\"\236\003\n\006Module\022K\n\rpackag" +
-      "e_parts\030\001 \003(\01324.org.jetbrains.kotlin.ser" +
-      "ialization.jvm.PackageParts\022L\n\016metadata_" +
-      "parts\030\002 \003(\01324.org.jetbrains.kotlin.seria" +
-      "lization.jvm.PackageParts\022\030\n\020jvm_package" +
-      "_name\030\003 \003(\t\022E\n\014string_table\030\004 \001(\0132/.org." +
-      "jetbrains.kotlin.serialization.StringTab",
-      "le\022T\n\024qualified_name_table\030\005 \001(\01326.org.j" +
-      "etbrains.kotlin.serialization.QualifiedN" +
-      "ameTable\022B\n\nannotation\030\006 \003(\0132..org.jetbr" +
-      "ains.kotlin.serialization.Annotation\"\366\001\n" +
-      "\014PackageParts\022\027\n\017package_fq_name\030\001 \002(\t\022\030" +
-      "\n\020short_class_name\030\002 \003(\t\022*\n\036multifile_fa" +
-      "cade_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033multifil" +
-      "e_facade_short_name\030\004 \003(\t\022.\n&class_with_" +
-      "jvm_package_name_short_name\030\005 \003(\t\0222\n&cla" +
-      "ss_with_jvm_package_name_package_id\030\006 \003(",
-      "\005B\002\020\001B\030B\026DebugJvmModuleProtoBuf"
+      "\n,core/metadata.jvm/src/jvm_module.debug" +
+      ".proto\022&org.jetbrains.kotlin.serializati" +
+      "on.jvm\032&core/metadata/src/metadata.debug" +
+      ".proto\"\236\003\n\006Module\022K\n\rpackage_parts\030\001 \003(\013" +
+      "24.org.jetbrains.kotlin.serialization.jv" +
+      "m.PackageParts\022L\n\016metadata_parts\030\002 \003(\01324" +
+      ".org.jetbrains.kotlin.serialization.jvm." +
+      "PackageParts\022\030\n\020jvm_package_name\030\003 \003(\t\022E" +
+      "\n\014string_table\030\004 \001(\0132/.org.jetbrains.kot" +
+      "lin.serialization.StringTable\022T\n\024qualifi",
+      "ed_name_table\030\005 \001(\01326.org.jetbrains.kotl" +
+      "in.serialization.QualifiedNameTable\022B\n\na" +
+      "nnotation\030\006 \003(\0132..org.jetbrains.kotlin.s" +
+      "erialization.Annotation\"\366\001\n\014PackageParts" +
+      "\022\027\n\017package_fq_name\030\001 \002(\t\022\030\n\020short_class" +
+      "_name\030\002 \003(\t\022*\n\036multifile_facade_short_na" +
+      "me_id\030\003 \003(\005B\002\020\001\022#\n\033multifile_facade_shor" +
+      "t_name\030\004 \003(\t\022.\n&class_with_jvm_package_n" +
+      "ame_short_name\030\005 \003(\t\0222\n&class_with_jvm_p" +
+      "ackage_name_package_id\030\006 \003(\005B\002\020\001B\030B\026Debu",
+      "gJvmModuleProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index 24c61b2f684..ffc38b3a9fb 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_descriptors.debug.proto
+// source: core/metadata.jvm/src/jvm_metadata.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
@@ -4689,66 +4689,66 @@ public final class DebugJvmProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n4core/descriptors.jvm/src/jvm_descripto" +
-      "rs.debug.proto\022&org.jetbrains.kotlin.ser" +
-      "ialization.jvm\0320core/deserialization/src" +
-      "/ext_options.debug.proto\0320core/deseriali" +
-      "zation/src/descriptors.debug.proto\"\244\003\n\020S" +
-      "tringTableTypes\022O\n\006record\030\001 \003(\0132?.org.je" +
-      "tbrains.kotlin.serialization.jvm.StringT" +
-      "ableTypes.Record\022\026\n\nlocal_name\030\005 \003(\005B\002\020\001" +
-      "\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020predefi" +
-      "ned_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b\n\topera",
-      "tion\030\003 \001(\0162I.org.jetbrains.kotlin.serial" +
-      "ization.jvm.StringTableTypes.Record.Oper" +
-      "ation:\004NONE\022\033\n\017substring_index\030\004 \003(\005B\002\020\001" +
-      "\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOperation\022" +
-      "\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n\020D" +
-      "ESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSignature\022" +
-      "\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"" +
-      ";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001" +
-      "\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPropertySign" +
-      "ature\022H\n\005field\030\001 \001(\01329.org.jetbrains.kot",
-      "lin.serialization.jvm.JvmFieldSignature\022" +
-      "T\n\020synthetic_method\030\002 \001(\0132:.org.jetbrain" +
-      "s.kotlin.serialization.jvm.JvmMethodSign" +
-      "ature\022J\n\006getter\030\003 \001(\0132:.org.jetbrains.ko" +
-      "tlin.serialization.jvm.JvmMethodSignatur" +
-      "e\022J\n\006setter\030\004 \001(\0132:.org.jetbrains.kotlin" +
-      ".serialization.jvm.JvmMethodSignature:\212\001" +
-      "\n\025constructor_signature\022/.org.jetbrains." +
-      "kotlin.serialization.Constructor\030d \001(\0132:" +
-      ".org.jetbrains.kotlin.serialization.jvm.",
-      "JvmMethodSignature:\202\001\n\020method_signature\022" +
-      ",.org.jetbrains.kotlin.serialization.Fun" +
-      "ction\030d \001(\0132:.org.jetbrains.kotlin.seria" +
-      "lization.jvm.JvmMethodSignature:T\n\030lambd" +
-      "a_class_origin_name\022,.org.jetbrains.kotl" +
-      "in.serialization.Function\030e \001(\005B\004\230\265\030\001:\206\001" +
-      "\n\022property_signature\022,.org.jetbrains.kot" +
-      "lin.serialization.Property\030d \001(\0132<.org.j" +
-      "etbrains.kotlin.serialization.jvm.JvmPro" +
-      "pertySignature:q\n\017type_annotation\022(.org.",
-      "jetbrains.kotlin.serialization.Type\030d \003(" +
-      "\0132..org.jetbrains.kotlin.serialization.A" +
-      "nnotation:8\n\006is_raw\022(.org.jetbrains.kotl" +
-      "in.serialization.Type\030e \001(\010:\204\001\n\031type_par" +
-      "ameter_annotation\0221.org.jetbrains.kotlin" +
-      ".serialization.TypeParameter\030d \003(\0132..org" +
-      ".jetbrains.kotlin.serialization.Annotati" +
-      "on:J\n\021class_module_name\022).org.jetbrains." +
-      "kotlin.serialization.Class\030e \001(\005B\004\230\265\030\001:u" +
-      "\n\024class_local_variable\022).org.jetbrains.k",
-      "otlin.serialization.Class\030f \003(\0132,.org.je" +
-      "tbrains.kotlin.serialization.Property:U\n" +
-      "\034anonymous_object_origin_name\022).org.jetb" +
-      "rains.kotlin.serialization.Class\030g \001(\005B\004" +
-      "\230\265\030\001:N\n\023package_module_name\022+.org.jetbra" +
-      "ins.kotlin.serialization.Package\030e \001(\005B\004" +
-      "\230\265\030\001:y\n\026package_local_variable\022+.org.jet" +
-      "brains.kotlin.serialization.Package\030f \003(" +
-      "\0132,.org.jetbrains.kotlin.serialization.P" +
-      "ropertyB\022B\020DebugJvmProtoBuf"
+      "\n.core/metadata.jvm/src/jvm_metadata.deb" +
+      "ug.proto\022&org.jetbrains.kotlin.serializa" +
+      "tion.jvm\032)core/metadata/src/ext_options." +
+      "debug.proto\032&core/metadata/src/metadata." +
+      "debug.proto\"\244\003\n\020StringTableTypes\022O\n\006reco" +
+      "rd\030\001 \003(\0132?.org.jetbrains.kotlin.serializ" +
+      "ation.jvm.StringTableTypes.Record\022\026\n\nloc" +
+      "al_name\030\005 \003(\005B\002\020\001\032\246\002\n\006Record\022\020\n\005range\030\001 " +
+      "\001(\005:\0011\022\030\n\020predefined_index\030\002 \001(\005\022\016\n\006stri" +
+      "ng\030\006 \001(\t\022b\n\toperation\030\003 \001(\0162I.org.jetbra",
+      "ins.kotlin.serialization.jvm.StringTable" +
+      "Types.Record.Operation:\004NONE\022\033\n\017substrin" +
+      "g_index\030\004 \003(\005B\002\020\001\022\030\n\014replace_char\030\005 \003(\005B" +
+      "\002\020\001\"E\n\tOperation\022\010\n\004NONE\020\000\022\030\n\024INTERNAL_T" +
+      "O_CLASS_ID\020\001\022\024\n\020DESC_TO_CLASS_ID\020\002\"<\n\022Jv" +
+      "mMethodSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004" +
+      "desc\030\002 \001(\005B\004\230\265\030\001\";\n\021JvmFieldSignature\022\022\n" +
+      "\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002" +
+      "\n\024JvmPropertySignature\022H\n\005field\030\001 \001(\01329." +
+      "org.jetbrains.kotlin.serialization.jvm.J",
+      "vmFieldSignature\022T\n\020synthetic_method\030\002 \001" +
+      "(\0132:.org.jetbrains.kotlin.serialization." +
+      "jvm.JvmMethodSignature\022J\n\006getter\030\003 \001(\0132:" +
+      ".org.jetbrains.kotlin.serialization.jvm." +
+      "JvmMethodSignature\022J\n\006setter\030\004 \001(\0132:.org" +
+      ".jetbrains.kotlin.serialization.jvm.JvmM" +
+      "ethodSignature:\212\001\n\025constructor_signature" +
+      "\022/.org.jetbrains.kotlin.serialization.Co" +
+      "nstructor\030d \001(\0132:.org.jetbrains.kotlin.s" +
+      "erialization.jvm.JvmMethodSignature:\202\001\n\020",
+      "method_signature\022,.org.jetbrains.kotlin." +
+      "serialization.Function\030d \001(\0132:.org.jetbr" +
+      "ains.kotlin.serialization.jvm.JvmMethodS" +
+      "ignature:T\n\030lambda_class_origin_name\022,.o" +
+      "rg.jetbrains.kotlin.serialization.Functi" +
+      "on\030e \001(\005B\004\230\265\030\001:\206\001\n\022property_signature\022,." +
+      "org.jetbrains.kotlin.serialization.Prope" +
+      "rty\030d \001(\0132<.org.jetbrains.kotlin.seriali" +
+      "zation.jvm.JvmPropertySignature:q\n\017type_" +
+      "annotation\022(.org.jetbrains.kotlin.serial",
+      "ization.Type\030d \003(\0132..org.jetbrains.kotli" +
+      "n.serialization.Annotation:8\n\006is_raw\022(.o" +
+      "rg.jetbrains.kotlin.serialization.Type\030e" +
+      " \001(\010:\204\001\n\031type_parameter_annotation\0221.org" +
+      ".jetbrains.kotlin.serialization.TypePara" +
+      "meter\030d \003(\0132..org.jetbrains.kotlin.seria" +
+      "lization.Annotation:J\n\021class_module_name" +
+      "\022).org.jetbrains.kotlin.serialization.Cl" +
+      "ass\030e \001(\005B\004\230\265\030\001:u\n\024class_local_variable\022" +
+      ").org.jetbrains.kotlin.serialization.Cla",
+      "ss\030f \003(\0132,.org.jetbrains.kotlin.serializ" +
+      "ation.Property:U\n\034anonymous_object_origi" +
+      "n_name\022).org.jetbrains.kotlin.serializat" +
+      "ion.Class\030g \001(\005B\004\230\265\030\001:N\n\023package_module_" +
+      "name\022+.org.jetbrains.kotlin.serializatio" +
+      "n.Package\030e \001(\005B\004\230\265\030\001:y\n\026package_local_v" +
+      "ariable\022+.org.jetbrains.kotlin.serializa" +
+      "tion.Package\030f \003(\0132,.org.jetbrains.kotli" +
+      "n.serialization.PropertyB\022B\020DebugJvmProt" +
+      "oBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt
index 28cefea20a4..f6032cb8e11 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
 
 /**
  * The version of the metadata serialized by the compiler and deserialized by the compiler and reflection.
- * This version includes the version of the core protobuf messages (descriptors.proto) as well as JVM extensions (jvm_descriptors.proto).
+ * This version includes the version of the core protobuf messages (metadata.proto) as well as JVM extensions (jvm_metadata.proto).
  */
 class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
     // NOTE: 1.1 is incompatible with 1.0 and hence with any other version except 1.1.*
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsBinaryVersion.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsBinaryVersion.kt
index e5590586604..868972c36c4 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsBinaryVersion.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsBinaryVersion.kt
@@ -22,7 +22,7 @@ import java.io.InputStream
 
 /**
  * The version of the format in which the .kotlin_builtins file is stored. This version also includes the version
- * of the core protobuf messages (descriptors.proto).
+ * of the core protobuf messages (metadata.proto).
  */
 class BuiltInsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
     override fun isCompatible() = this.isCompatibleTo(INSTANCE)
diff --git a/core/descriptors.jvm/src/jvm_descriptors.proto b/core/metadata.jvm/src/jvm_metadata.proto
similarity index 97%
rename from core/descriptors.jvm/src/jvm_descriptors.proto
rename to core/metadata.jvm/src/jvm_metadata.proto
index 71da4db1d5b..1aa1964a9c2 100644
--- a/core/descriptors.jvm/src/jvm_descriptors.proto
+++ b/core/metadata.jvm/src/jvm_metadata.proto
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-import "core/deserialization/src/ext_options.proto";
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/ext_options.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JvmProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/descriptors.jvm/src/jvm_module.proto b/core/metadata.jvm/src/jvm_module.proto
similarity index 98%
rename from core/descriptors.jvm/src/jvm_module.proto
rename to core/metadata.jvm/src/jvm_module.proto
index 01bd458b5d3..26638f0f884 100644
--- a/core/descriptors.jvm/src/jvm_module.proto
+++ b/core/metadata.jvm/src/jvm_module.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JvmModuleProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java b/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
similarity index 99%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
rename to core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
index 686d0323bf1..70de60896b9 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
+++ b/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_module.proto
+// source: core/metadata.jvm/src/jvm_module.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
similarity index 99%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
rename to core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
index b7fa4e25a4c..ee79c51d3f9 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+++ b/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_descriptors.proto
+// source: core/metadata.jvm/src/jvm_metadata.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
diff --git a/core/deserialization/src/builtins.proto b/core/metadata/src/builtins.proto
similarity index 96%
rename from core/deserialization/src/builtins.proto
rename to core/metadata/src/builtins.proto
index cfed3e555eb..53d5e7f1280 100644
--- a/core/deserialization/src/builtins.proto
+++ b/core/metadata/src/builtins.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.builtins;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "BuiltInsProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/deserialization/src/ext_options.proto b/core/metadata/src/ext_options.proto
similarity index 100%
rename from core/deserialization/src/ext_options.proto
rename to core/metadata/src/ext_options.proto
diff --git a/core/deserialization/src/google/protobuf/descriptor.proto b/core/metadata/src/google/protobuf/descriptor.proto
similarity index 100%
rename from core/deserialization/src/google/protobuf/descriptor.proto
rename to core/metadata/src/google/protobuf/descriptor.proto
diff --git a/core/deserialization/src/descriptors.proto b/core/metadata/src/metadata.proto
similarity index 99%
rename from core/deserialization/src/descriptors.proto
rename to core/metadata/src/metadata.proto
index f94a65297ac..ccfd4e8218d 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/metadata/src/metadata.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization;
 
-import "core/deserialization/src/ext_options.proto";
+import "core/metadata/src/ext_options.proto";
 
 option java_outer_classname = "ProtoBuf";
 option optimize_for = LITE_RUNTIME;
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
similarity index 99%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
rename to core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index df58b9141ce..56291a10579 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/deserialization/src/descriptors.proto
+// source: core/metadata/src/metadata.proto
 
 package org.jetbrains.kotlin.serialization;
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
similarity index 99%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
rename to core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
index 44315a312cf..4d9e52d6703 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+++ b/core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/deserialization/src/builtins.proto
+// source: core/metadata/src/builtins.proto
 
 package org.jetbrains.kotlin.serialization.builtins;
 
diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index 3b81eabfc88..cbbabb8786b 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -50,17 +50,17 @@ class ProtoPath(val file: String) {
 }
 
 val PROTO_PATHS: List<ProtoPath> = listOf(
-        ProtoPath("core/deserialization/src/descriptors.proto"),
-        ProtoPath("core/deserialization/src/builtins.proto"),
+        ProtoPath("core/metadata/src/metadata.proto"),
+        ProtoPath("core/metadata/src/builtins.proto"),
         ProtoPath("js/js.serializer/src/js.proto"),
         ProtoPath("js/js.serializer/src/js-ast.proto"),
-        ProtoPath("core/descriptors.jvm/src/jvm_descriptors.proto"),
-        ProtoPath("core/descriptors.jvm/src/jvm_module.proto"),
+        ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"),
+        ProtoPath("core/metadata.jvm/src/jvm_module.proto"),
         ProtoPath("build-common/src/java_descriptors.proto")
 )
 
-private val EXT_OPTIONS_PROTO_PATH = ProtoPath("core/deserialization/src/ext_options.proto")
-private val PROTOBUF_PROTO_PATHS = listOf("./", "core/deserialization/src")
+private val EXT_OPTIONS_PROTO_PATH = ProtoPath("core/metadata/src/ext_options.proto")
+private val PROTOBUF_PROTO_PATHS = listOf("./", "core/metadata/src")
 
 fun main(args: Array<String>) {
     try {
diff --git a/js/js.serializer/src/js.proto b/js/js.serializer/src/js.proto
index 3dd2d64ef6b..e1e691d5e3c 100644
--- a/js/js.serializer/src/js.proto
+++ b/js/js.serializer/src/js.proto
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.js;
 
-import "core/deserialization/src/descriptors.proto";
+import "core/metadata/src/metadata.proto";
 
 option java_outer_classname = "JsProtoBuf";
 option optimize_for = LITE_RUNTIME;